From e8563e7031e8842d2c1f65cba357033f13869695 Mon Sep 17 00:00:00 2001 From: Joe George Date: Mon, 19 Feb 2024 14:35:46 -0500 Subject: [PATCH] HEAD:(zeroc-ice/ice@765416aea5) Use fixed width types (zeroc-ice/ice#1806) - Update the generated code to use fixed width types (std::XXX_t) types - Remove Ice::Long / long long int --- slice2cpp/cpp/src/IceGrid/Internal.cpp | 266 +++++++-------- slice2cpp/cpp/src/IceGrid/Internal.h | 194 +++++------ slice2cpp/cpp/src/IceStorm/Election.cpp | 46 +-- slice2cpp/cpp/src/IceStorm/Election.h | 56 ++-- slice2cpp/cpp/src/IceStorm/LLURecord.h | 6 +- slice2cpp/cpp/src/IceStorm/LinkRecord.h | 4 +- slice2cpp/cpp/src/IceStorm/SubscriberRecord.h | 4 +- slice2cpp/cpp/src/icegriddb/DBTypes.h | 2 +- .../cpp/test/Glacier2/dynamicFiltering/Test.h | 6 +- .../cpp/test/Glacier2/override/Callback.cpp | 20 +- .../cpp/test/Glacier2/override/Callback.h | 20 +- .../cpp/test/Glacier2/router/Callback.cpp | 48 +-- slice2cpp/cpp/test/Glacier2/router/Callback.h | 24 +- slice2cpp/cpp/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/cpp/test/Ice/acm/Test.h | 40 +-- slice2cpp/cpp/test/Ice/ami/Test.cpp | 138 ++++---- slice2cpp/cpp/test/Ice/ami/Test.h | 98 +++--- slice2cpp/cpp/test/Ice/background/Test.cpp | 10 +- slice2cpp/cpp/test/Ice/background/Test.h | 10 +- slice2cpp/cpp/test/Ice/custom/Test.cpp | 40 +-- slice2cpp/cpp/test/Ice/custom/Test.h | 46 +-- slice2cpp/cpp/test/Ice/custom/TestAMD.cpp | 44 +-- slice2cpp/cpp/test/Ice/custom/TestAMD.h | 48 +-- slice2cpp/cpp/test/Ice/defaultValue/Test.h | 94 +++--- slice2cpp/cpp/test/Ice/dispatcher/Test.cpp | 10 +- slice2cpp/cpp/test/Ice/dispatcher/Test.h | 10 +- slice2cpp/cpp/test/Ice/enums/Test.h | 16 +- slice2cpp/cpp/test/Ice/exceptions/Test.cpp | 134 ++++---- slice2cpp/cpp/test/Ice/exceptions/Test.h | 140 ++++---- slice2cpp/cpp/test/Ice/exceptions/TestAMD.cpp | 134 ++++---- slice2cpp/cpp/test/Ice/exceptions/TestAMD.h | 140 ++++---- .../cpp/test/Ice/faultTolerance/Test.cpp | 16 +- slice2cpp/cpp/test/Ice/faultTolerance/Test.h | 10 +- slice2cpp/cpp/test/Ice/hold/Test.cpp | 48 +-- slice2cpp/cpp/test/Ice/hold/Test.h | 32 +- slice2cpp/cpp/test/Ice/inheritance/Test.h | 144 ++++---- slice2cpp/cpp/test/Ice/interceptor/Test.cpp | 260 +++++++-------- slice2cpp/cpp/test/Ice/interceptor/Test.h | 120 +++---- slice2cpp/cpp/test/Ice/location/Test.cpp | 16 +- slice2cpp/cpp/test/Ice/location/Test.h | 10 +- slice2cpp/cpp/test/Ice/metrics/Test.h | 2 +- slice2cpp/cpp/test/Ice/metrics/TestAMD.h | 2 +- slice2cpp/cpp/test/Ice/objects/Test.h | 16 +- slice2cpp/cpp/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/cpp/test/Ice/operations/Test.h | 122 +++---- slice2cpp/cpp/test/Ice/operations/TestAMD.cpp | 174 +++++----- slice2cpp/cpp/test/Ice/operations/TestAMD.h | 122 +++---- slice2cpp/cpp/test/Ice/optional/Test.cpp | 214 ++++++------ slice2cpp/cpp/test/Ice/optional/Test.h | 246 +++++++------- slice2cpp/cpp/test/Ice/optional/TestAMD.cpp | 214 ++++++------ slice2cpp/cpp/test/Ice/optional/TestAMD.h | 246 +++++++------- slice2cpp/cpp/test/Ice/retry/Test.cpp | 34 +- slice2cpp/cpp/test/Ice/retry/Test.h | 22 +- slice2cpp/cpp/test/Ice/scope/Test.h | 12 +- .../test/Ice/slicing/objects/ClientPrivate.h | 22 +- .../test/Ice/slicing/objects/ServerPrivate.h | 14 +- .../Ice/slicing/objects/ServerPrivateAMD.h | 14 +- slice2cpp/cpp/test/Ice/slicing/objects/Test.h | 20 +- .../cpp/test/Ice/slicing/objects/TestAMD.h | 16 +- slice2cpp/cpp/test/Ice/stream/Test.h | 58 ++-- .../cpp/test/Ice/threadPoolPriority/Test.cpp | 16 +- .../cpp/test/Ice/threadPoolPriority/Test.h | 10 +- slice2cpp/cpp/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/cpp/test/Ice/timeout/Test.h | 22 +- slice2cpp/cpp/test/Ice/udp/Test.h | 2 +- slice2cpp/cpp/test/IceBridge/simple/Test.cpp | 132 ++++---- slice2cpp/cpp/test/IceBridge/simple/Test.h | 90 ++--- slice2cpp/cpp/test/IceStorm/rep1/Single.cpp | 10 +- slice2cpp/cpp/test/IceStorm/rep1/Single.h | 10 +- .../cpp/test/IceStorm/repgrid/Single.cpp | 10 +- slice2cpp/cpp/test/IceStorm/repgrid/Single.h | 10 +- .../cpp/test/IceStorm/repstress/Single.cpp | 10 +- .../cpp/test/IceStorm/repstress/Single.h | 10 +- slice2cpp/cpp/test/IceStorm/single/Single.cpp | 10 +- slice2cpp/cpp/test/IceStorm/single/Single.h | 10 +- slice2cpp/cpp/test/IceStorm/stress/Event.cpp | 10 +- slice2cpp/cpp/test/IceStorm/stress/Event.h | 10 +- slice2cpp/csharp/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/csharp/test/Ice/acm/Test.h | 40 +-- slice2cpp/csharp/test/Ice/ami/Test.cpp | 98 +++--- slice2cpp/csharp/test/Ice/ami/Test.h | 66 ++-- slice2cpp/csharp/test/Ice/defaultValue/Test.h | 174 +++++----- slice2cpp/csharp/test/Ice/dictMapping/Test.h | 8 +- .../csharp/test/Ice/dictMapping/TestAMD.h | 6 +- slice2cpp/csharp/test/Ice/dispatcher/Test.cpp | 10 +- slice2cpp/csharp/test/Ice/dispatcher/Test.h | 10 +- slice2cpp/csharp/test/Ice/enums/Test.h | 16 +- slice2cpp/csharp/test/Ice/exceptions/Test.cpp | 126 +++---- slice2cpp/csharp/test/Ice/exceptions/Test.h | 124 +++---- .../csharp/test/Ice/exceptions/TestAMD.cpp | 122 +++---- .../csharp/test/Ice/exceptions/TestAMD.h | 124 +++---- .../csharp/test/Ice/faultTolerance/Test.cpp | 16 +- .../csharp/test/Ice/faultTolerance/Test.h | 10 +- slice2cpp/csharp/test/Ice/hash/Test.h | 46 +-- slice2cpp/csharp/test/Ice/hold/Test.cpp | 48 +-- slice2cpp/csharp/test/Ice/hold/Test.h | 32 +- .../csharp/test/Ice/interceptor/Test.cpp | 260 +++++++-------- slice2cpp/csharp/test/Ice/interceptor/Test.h | 120 +++---- slice2cpp/csharp/test/Ice/location/Test.cpp | 16 +- slice2cpp/csharp/test/Ice/location/Test.h | 10 +- slice2cpp/csharp/test/Ice/metrics/Test.h | 2 +- slice2cpp/csharp/test/Ice/metrics/TestAMD.h | 2 +- .../csharp/test/Ice/namespacemd/Namespace.h | 24 +- .../csharp/test/Ice/namespacemd/NoNamespace.h | 30 +- slice2cpp/csharp/test/Ice/objects/Test.h | 20 +- slice2cpp/csharp/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/csharp/test/Ice/operations/Test.h | 122 +++---- .../csharp/test/Ice/operations/TestAMD.cpp | 174 +++++----- .../csharp/test/Ice/operations/TestAMD.h | 122 +++---- slice2cpp/csharp/test/Ice/optional/Test.cpp | 150 ++++----- slice2cpp/csharp/test/Ice/optional/Test.h | 196 +++++------ .../csharp/test/Ice/optional/TestAMD.cpp | 142 ++++---- slice2cpp/csharp/test/Ice/optional/TestAMD.h | 196 +++++------ slice2cpp/csharp/test/Ice/retry/Test.cpp | 34 +- slice2cpp/csharp/test/Ice/retry/Test.h | 22 +- slice2cpp/csharp/test/Ice/scope/Test.h | 12 +- slice2cpp/csharp/test/Ice/seqMapping/Test.h | 64 ++-- .../csharp/test/Ice/seqMapping/TestAMD.h | 56 ++-- .../test/Ice/slicing/objects/ClientPrivate.h | 22 +- .../test/Ice/slicing/objects/ServerPrivate.h | 14 +- .../Ice/slicing/objects/ServerPrivateAMD.h | 14 +- .../csharp/test/Ice/slicing/objects/Test.h | 20 +- .../csharp/test/Ice/slicing/objects/TestAMD.h | 16 +- slice2cpp/csharp/test/Ice/stream/Test.h | 34 +- slice2cpp/csharp/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/csharp/test/Ice/timeout/Test.h | 22 +- slice2cpp/csharp/test/Ice/udp/Test.h | 2 +- slice2cpp/csharp/test/Slice/escape/Clash.cpp | 30 +- slice2cpp/csharp/test/Slice/escape/Clash.h | 60 ++-- slice2cpp/csharp/test/Slice/escape/Key.cpp | 36 +- slice2cpp/csharp/test/Slice/escape/Key.h | 86 ++--- slice2cpp/csharp/test/Slice/macros/Test.h | 16 +- slice2cpp/csharp/test/Slice/structure/Test.h | 18 +- .../test/src/main/java/test/Ice/acm/Test.cpp | 44 +-- .../test/src/main/java/test/Ice/acm/Test.h | 40 +-- .../test/src/main/java/test/Ice/ami/Test.cpp | 178 +++++----- .../test/src/main/java/test/Ice/ami/Test.h | 104 +++--- .../main/java/test/Ice/background/Test.cpp | 10 +- .../src/main/java/test/Ice/background/Test.h | 10 +- .../src/main/java/test/Ice/classLoader/Test.h | 6 +- .../test/src/main/java/test/Ice/custom/Test.h | 18 +- .../main/java/test/Ice/defaultValue/Test.h | 100 +++--- .../main/java/test/Ice/dispatcher/Test.cpp | 10 +- .../src/main/java/test/Ice/dispatcher/Test.h | 10 +- .../test/src/main/java/test/Ice/enums/Test.h | 16 +- .../main/java/test/Ice/exceptions/Test.cpp | 122 +++---- .../src/main/java/test/Ice/exceptions/Test.h | 124 +++---- .../main/java/test/Ice/exceptions/TestAMD.cpp | 122 +++---- .../main/java/test/Ice/exceptions/TestAMD.h | 124 +++---- .../java/test/Ice/faultTolerance/Test.cpp | 16 +- .../main/java/test/Ice/faultTolerance/Test.h | 10 +- .../test/src/main/java/test/Ice/hash/Test.h | 24 +- .../test/src/main/java/test/Ice/hold/Test.cpp | 48 +-- .../test/src/main/java/test/Ice/hold/Test.h | 32 +- .../main/java/test/Ice/interceptor/Test.cpp | 260 +++++++-------- .../src/main/java/test/Ice/interceptor/Test.h | 120 +++---- .../src/main/java/test/Ice/interrupt/Test.cpp | 10 +- .../src/main/java/test/Ice/interrupt/Test.h | 10 +- .../src/main/java/test/Ice/location/Test.cpp | 16 +- .../src/main/java/test/Ice/location/Test.h | 10 +- .../src/main/java/test/Ice/metrics/Test.h | 2 +- .../src/main/java/test/Ice/metrics/TestAMD.h | 2 +- .../src/main/java/test/Ice/objects/Test.h | 16 +- .../main/java/test/Ice/operations/Test.cpp | 182 +++++----- .../src/main/java/test/Ice/operations/Test.h | 122 +++---- .../main/java/test/Ice/operations/TestAMD.cpp | 174 +++++----- .../main/java/test/Ice/operations/TestAMD.h | 122 +++---- .../src/main/java/test/Ice/optional/Test.cpp | 270 +++++++-------- .../src/main/java/test/Ice/optional/Test.h | 262 +++++++-------- .../main/java/test/Ice/optional/TestAMD.cpp | 254 +++++++------- .../src/main/java/test/Ice/optional/TestAMD.h | 262 +++++++-------- .../main/java/test/Ice/packagemd/NoPackage.h | 30 +- .../main/java/test/Ice/packagemd/Package.h | 48 +-- .../src/main/java/test/Ice/retry/Test.cpp | 34 +- .../test/src/main/java/test/Ice/retry/Test.h | 22 +- .../test/src/main/java/test/Ice/scope/Test.h | 12 +- .../src/main/java/test/Ice/seqMapping/Test.h | 10 +- .../main/java/test/Ice/seqMapping/TestAMD.h | 10 +- .../src/main/java/test/Ice/serialize/Test.h | 18 +- .../test/Ice/slicing/objects/ClientPrivate.h | 42 +-- .../test/Ice/slicing/objects/ServerPrivate.h | 34 +- .../Ice/slicing/objects/ServerPrivateAMD.h | 30 +- .../test/src/main/java/test/Ice/stream/Test.h | 34 +- .../java/test/Ice/threadPoolPriority/Test.cpp | 16 +- .../java/test/Ice/threadPoolPriority/Test.h | 10 +- .../src/main/java/test/Ice/timeout/Test.cpp | 20 +- .../src/main/java/test/Ice/timeout/Test.h | 22 +- .../test/src/main/java/test/Ice/udp/Test.h | 2 +- .../src/main/java/test/Slice/escape/Clash.cpp | 30 +- .../src/main/java/test/Slice/escape/Clash.h | 60 ++-- .../src/main/java/test/Slice/escape/Key.cpp | 36 +- .../src/main/java/test/Slice/escape/Key.h | 72 ++-- .../src/main/java/test/Slice/macros/Test.h | 16 +- .../src/main/java/test/Slice/structure/Test.h | 18 +- slice2cpp/js/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/js/test/Ice/acm/Test.h | 40 +-- slice2cpp/js/test/Ice/ami/Test.cpp | 52 +-- slice2cpp/js/test/Ice/ami/Test.h | 40 +-- slice2cpp/js/test/Ice/defaultValue/Test.h | 114 +++---- slice2cpp/js/test/Ice/enums/Test.h | 16 +- slice2cpp/js/test/Ice/exceptions/Test.cpp | 122 +++---- slice2cpp/js/test/Ice/exceptions/Test.h | 124 +++---- slice2cpp/js/test/Ice/hold/Test.cpp | 48 +-- slice2cpp/js/test/Ice/hold/Test.h | 32 +- slice2cpp/js/test/Ice/import/Demo/Circle.h | 4 +- slice2cpp/js/test/Ice/import/Demo/Point.h | 6 +- slice2cpp/js/test/Ice/inheritance/Test.h | 144 ++++---- slice2cpp/js/test/Ice/location/Test.cpp | 16 +- slice2cpp/js/test/Ice/location/Test.h | 10 +- slice2cpp/js/test/Ice/objects/Test.h | 16 +- slice2cpp/js/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/js/test/Ice/operations/Test.h | 122 +++---- .../js/test/Ice/optional/ClientPrivate.cpp | 10 +- .../js/test/Ice/optional/ClientPrivate.h | 10 +- slice2cpp/js/test/Ice/optional/Test.cpp | 150 ++++----- slice2cpp/js/test/Ice/optional/Test.h | 198 +++++------ slice2cpp/js/test/Ice/retry/Test.cpp | 24 +- slice2cpp/js/test/Ice/retry/Test.h | 12 +- slice2cpp/js/test/Ice/scope/Test.h | 12 +- slice2cpp/js/test/Ice/slicing/objects/Test.h | 42 +-- slice2cpp/js/test/Ice/stream/Test.h | 26 +- slice2cpp/js/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/js/test/Ice/timeout/Test.h | 22 +- slice2cpp/js/test/Slice/escape/Clash.cpp | 30 +- slice2cpp/js/test/Slice/escape/Clash.h | 60 ++-- slice2cpp/js/test/Slice/escape/Key.cpp | 36 +- slice2cpp/js/test/Slice/escape/Key.h | 86 ++--- slice2cpp/js/test/Slice/macros/Test.h | 16 +- slice2cpp/js/test/typescript/Ice/acm/Test.cpp | 44 +-- slice2cpp/js/test/typescript/Ice/acm/Test.h | 40 +-- slice2cpp/js/test/typescript/Ice/ami/Test.cpp | 52 +-- slice2cpp/js/test/typescript/Ice/ami/Test.h | 40 +-- .../test/typescript/Ice/defaultValue/Test.h | 114 +++---- slice2cpp/js/test/typescript/Ice/enums/Test.h | 16 +- .../test/typescript/Ice/exceptions/Test.cpp | 122 +++---- .../js/test/typescript/Ice/exceptions/Test.h | 124 +++---- .../js/test/typescript/Ice/hold/Test.cpp | 48 +-- slice2cpp/js/test/typescript/Ice/hold/Test.h | 32 +- .../js/test/typescript/Ice/inheritance/Test.h | 144 ++++---- .../js/test/typescript/Ice/location/Test.cpp | 16 +- .../js/test/typescript/Ice/location/Test.h | 10 +- .../js/test/typescript/Ice/objects/Test.h | 16 +- .../test/typescript/Ice/operations/Test.cpp | 182 +++++----- .../js/test/typescript/Ice/operations/Test.h | 122 +++---- .../typescript/Ice/optional/ClientPrivate.cpp | 10 +- .../typescript/Ice/optional/ClientPrivate.h | 10 +- .../js/test/typescript/Ice/optional/Test.cpp | 150 ++++----- .../js/test/typescript/Ice/optional/Test.h | 198 +++++------ .../js/test/typescript/Ice/retry/Test.cpp | 24 +- slice2cpp/js/test/typescript/Ice/retry/Test.h | 12 +- slice2cpp/js/test/typescript/Ice/scope/Test.h | 12 +- .../typescript/Ice/slicing/objects/Test.h | 42 +-- .../js/test/typescript/Ice/stream/Test.h | 26 +- .../js/test/typescript/Ice/timeout/Test.cpp | 20 +- .../js/test/typescript/Ice/timeout/Test.h | 22 +- .../js/test/typescript/Slice/macros/Test.h | 16 +- slice2cpp/matlab/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/matlab/test/Ice/acm/Test.h | 40 +-- slice2cpp/matlab/test/Ice/ami/Test.cpp | 178 +++++----- slice2cpp/matlab/test/Ice/ami/Test.h | 104 +++--- slice2cpp/matlab/test/Ice/defaultValue/Test.h | 100 +++--- slice2cpp/matlab/test/Ice/enums/Test.h | 16 +- slice2cpp/matlab/test/Ice/exceptions/Test.cpp | 134 ++++---- slice2cpp/matlab/test/Ice/exceptions/Test.h | 140 ++++---- slice2cpp/matlab/test/Ice/objects/LocalTest.h | 20 +- slice2cpp/matlab/test/Ice/objects/Test.h | 16 +- slice2cpp/matlab/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/matlab/test/Ice/operations/Test.h | 122 +++---- .../test/Ice/optional/ClientPrivate.cpp | 10 +- .../matlab/test/Ice/optional/ClientPrivate.h | 14 +- slice2cpp/matlab/test/Ice/optional/Test.cpp | 150 ++++----- slice2cpp/matlab/test/Ice/optional/Test.h | 198 +++++------ .../test/Ice/slicing/objects/ClientPrivate.h | 42 +-- slice2cpp/matlab/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/matlab/test/Ice/timeout/Test.h | 22 +- slice2cpp/matlab/test/Slice/escape/Test.h | 38 +-- slice2cpp/php/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/php/test/Ice/acm/Test.h | 40 +-- slice2cpp/php/test/Ice/defaultValue/Test.h | 100 +++--- slice2cpp/php/test/Ice/enums/Test.h | 16 +- slice2cpp/php/test/Ice/exceptions/Test.cpp | 122 +++---- slice2cpp/php/test/Ice/exceptions/Test.h | 124 +++---- slice2cpp/php/test/Ice/objects/Test.h | 12 +- slice2cpp/php/test/Ice/operations/Test.cpp | 166 +++++----- slice2cpp/php/test/Ice/operations/Test.h | 106 +++--- .../php/test/Ice/optional/ClientPrivate.cpp | 10 +- .../php/test/Ice/optional/ClientPrivate.h | 14 +- slice2cpp/php/test/Ice/optional/Test.cpp | 150 ++++----- slice2cpp/php/test/Ice/optional/Test.h | 198 +++++------ slice2cpp/php/test/Ice/scope/Test.h | 12 +- .../test/Ice/slicing/objects/ClientPrivate.h | 22 +- slice2cpp/php/test/Ice/slicing/objects/Test.h | 20 +- slice2cpp/php/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/php/test/Ice/timeout/Test.h | 22 +- slice2cpp/php/test/Slice/escape/Clash.h | 32 +- slice2cpp/php/test/Slice/escape/Key.cpp | 46 +-- slice2cpp/php/test/Slice/escape/Key.h | 82 ++--- slice2cpp/php/test/Slice/macros/Test.h | 16 +- slice2cpp/php/test/Slice/structure/Test.h | 16 +- slice2cpp/python/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/python/test/Ice/acm/Test.h | 40 +-- slice2cpp/python/test/Ice/ami/Test.cpp | 82 ++--- slice2cpp/python/test/Ice/ami/Test.h | 56 ++-- slice2cpp/python/test/Ice/asyncio/Test.cpp | 42 +-- slice2cpp/python/test/Ice/asyncio/Test.h | 30 +- slice2cpp/python/test/Ice/blobject/Test.cpp | 36 +- slice2cpp/python/test/Ice/blobject/Test.h | 22 +- slice2cpp/python/test/Ice/custom/Test.h | 20 +- slice2cpp/python/test/Ice/custom/TestNumPy.h | 18 +- slice2cpp/python/test/Ice/defaultValue/Test.h | 100 +++--- slice2cpp/python/test/Ice/dispatcher/Test.cpp | 10 +- slice2cpp/python/test/Ice/dispatcher/Test.h | 10 +- slice2cpp/python/test/Ice/enums/Test.h | 16 +- slice2cpp/python/test/Ice/exceptions/Test.cpp | 158 ++++----- slice2cpp/python/test/Ice/exceptions/Test.h | 154 ++++----- .../python/test/Ice/faultTolerance/Test.cpp | 16 +- .../python/test/Ice/faultTolerance/Test.h | 10 +- slice2cpp/python/test/Ice/location/Test.cpp | 16 +- slice2cpp/python/test/Ice/location/Test.h | 10 +- .../python/test/Ice/objects/ClientPrivate.h | 4 +- .../python/test/Ice/objects/ServerPrivate.h | 4 +- slice2cpp/python/test/Ice/objects/Test.h | 12 +- slice2cpp/python/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/python/test/Ice/operations/Test.h | 122 +++---- .../test/Ice/optional/ClientPrivate.cpp | 10 +- .../python/test/Ice/optional/ClientPrivate.h | 14 +- slice2cpp/python/test/Ice/optional/Test.cpp | 218 ++++++------ slice2cpp/python/test/Ice/optional/Test.h | 234 ++++++------- .../python/test/Ice/packagemd/NoPackage.h | 30 +- slice2cpp/python/test/Ice/packagemd/Package.h | 48 +-- slice2cpp/python/test/Ice/scope/Test.h | 12 +- .../test/Ice/slicing/objects/ClientPrivate.h | 22 +- .../test/Ice/slicing/objects/ServerPrivate.h | 14 +- .../python/test/Ice/slicing/objects/Test.h | 20 +- slice2cpp/python/test/Ice/thread/Test.cpp | 42 +-- slice2cpp/python/test/Ice/thread/Test.h | 30 +- slice2cpp/python/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/python/test/Ice/timeout/Test.h | 22 +- slice2cpp/python/test/Slice/escape/Clash.h | 32 +- slice2cpp/python/test/Slice/escape/Key.cpp | 32 +- slice2cpp/python/test/Slice/escape/Key.h | 50 +-- slice2cpp/python/test/Slice/import/Test1.h | 4 +- slice2cpp/python/test/Slice/import/Test2.h | 6 +- slice2cpp/python/test/Slice/macros/Test.h | 16 +- slice2cpp/python/test/Slice/structure/Test.h | 12 +- slice2cpp/ruby/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/ruby/test/Ice/acm/Test.h | 40 +-- slice2cpp/ruby/test/Ice/defaultValue/Test.h | 100 +++--- slice2cpp/ruby/test/Ice/enums/Test.h | 16 +- slice2cpp/ruby/test/Ice/exceptions/Test.cpp | 134 ++++---- slice2cpp/ruby/test/Ice/exceptions/Test.h | 140 ++++---- .../ruby/test/Ice/objects/ClientPrivate.h | 4 +- slice2cpp/ruby/test/Ice/objects/Test.h | 12 +- slice2cpp/ruby/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/ruby/test/Ice/operations/Test.h | 122 +++---- .../ruby/test/Ice/optional/ClientPrivate.cpp | 10 +- .../ruby/test/Ice/optional/ClientPrivate.h | 14 +- slice2cpp/ruby/test/Ice/optional/Test.cpp | 150 ++++----- slice2cpp/ruby/test/Ice/optional/Test.h | 198 +++++------ slice2cpp/ruby/test/Ice/scope/Test.h | 12 +- .../test/Ice/slicing/objects/ClientPrivate.h | 22 +- .../ruby/test/Ice/slicing/objects/Test.h | 20 +- slice2cpp/ruby/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/ruby/test/Ice/timeout/Test.h | 22 +- slice2cpp/ruby/test/Slice/escape/Clash.h | 32 +- slice2cpp/ruby/test/Slice/escape/Key.cpp | 22 +- slice2cpp/ruby/test/Slice/escape/Key.h | 50 +-- slice2cpp/ruby/test/Slice/macros/Test.h | 16 +- slice2cpp/ruby/test/Slice/structure/Test.h | 16 +- slice2cpp/scripts/Controller.cpp | 34 +- slice2cpp/scripts/Controller.h | 22 +- slice2cpp/slice/Glacier2/Metrics.h | 18 +- slice2cpp/slice/Glacier2/Router.cpp | 40 +-- slice2cpp/slice/Glacier2/Router.h | 20 +- slice2cpp/slice/Glacier2/SSLInfo.h | 6 +- slice2cpp/slice/Glacier2/Session.cpp | 16 +- slice2cpp/slice/Glacier2/Session.h | 10 +- slice2cpp/slice/Ice/BuiltinSequences.h | 8 +- slice2cpp/slice/Ice/EndpointTypes.h | 18 +- slice2cpp/slice/Ice/Metrics.cpp | 20 +- slice2cpp/slice/Ice/Metrics.h | 78 ++--- slice2cpp/slice/Ice/Process.cpp | 10 +- slice2cpp/slice/Ice/Process.h | 10 +- slice2cpp/slice/Ice/RemoteLogger.cpp | 20 +- slice2cpp/slice/Ice/RemoteLogger.h | 24 +- slice2cpp/slice/Ice/Version.h | 12 +- slice2cpp/slice/IceGrid/Admin.cpp | 168 +++++----- slice2cpp/slice/IceGrid/Admin.h | 176 +++++----- slice2cpp/slice/IceGrid/Registry.cpp | 32 +- slice2cpp/slice/IceGrid/Registry.h | 20 +- slice2cpp/slice/IceGrid/Session.cpp | 10 +- slice2cpp/slice/IceGrid/Session.h | 10 +- slice2cpp/slice/IcePatch2/FileInfo.h | 8 +- slice2cpp/slice/IcePatch2/FileServer.cpp | 56 ++-- slice2cpp/slice/IcePatch2/FileServer.h | 44 +-- slice2cpp/slice/IceStorm/IceStorm.cpp | 10 +- slice2cpp/slice/IceStorm/IceStorm.h | 14 +- slice2cpp/slice/IceStorm/Metrics.h | 18 +- slice2cpp/swift/test/Ice/acm/Test.cpp | 44 +-- slice2cpp/swift/test/Ice/acm/Test.h | 40 +-- slice2cpp/swift/test/Ice/ami/Test.cpp | 138 ++++---- slice2cpp/swift/test/Ice/ami/Test.h | 98 +++--- slice2cpp/swift/test/Ice/defaultValue/Test.h | 94 +++--- slice2cpp/swift/test/Ice/enums/Test.h | 16 +- slice2cpp/swift/test/Ice/exceptions/Test.cpp | 134 ++++---- slice2cpp/swift/test/Ice/exceptions/Test.h | 140 ++++---- .../swift/test/Ice/exceptions/TestAMD.cpp | 134 ++++---- slice2cpp/swift/test/Ice/exceptions/TestAMD.h | 140 ++++---- slice2cpp/swift/test/Ice/hold/Test.cpp | 48 +-- slice2cpp/swift/test/Ice/hold/Test.h | 32 +- slice2cpp/swift/test/Ice/inheritance/Test.h | 144 ++++---- slice2cpp/swift/test/Ice/interceptor/Test.cpp | 208 ++++++------ slice2cpp/swift/test/Ice/interceptor/Test.h | 96 +++--- slice2cpp/swift/test/Ice/location/Test.cpp | 16 +- slice2cpp/swift/test/Ice/location/Test.h | 10 +- slice2cpp/swift/test/Ice/objects/Test.h | 16 +- slice2cpp/swift/test/Ice/operations/Test.cpp | 182 +++++----- slice2cpp/swift/test/Ice/operations/Test.h | 122 +++---- .../swift/test/Ice/operations/TestAMD.cpp | 174 +++++----- slice2cpp/swift/test/Ice/operations/TestAMD.h | 122 +++---- slice2cpp/swift/test/Ice/optional/Test.cpp | 214 ++++++------ slice2cpp/swift/test/Ice/optional/Test.h | 248 +++++++------- slice2cpp/swift/test/Ice/optional/TestAMD.cpp | 142 ++++---- slice2cpp/swift/test/Ice/optional/TestAMD.h | 198 +++++------ slice2cpp/swift/test/Ice/retry/Test.cpp | 34 +- slice2cpp/swift/test/Ice/retry/Test.h | 22 +- slice2cpp/swift/test/Ice/scope/Test.h | 12 +- .../test/Ice/slicing/objects/ClientPrivate.h | 22 +- .../test/Ice/slicing/objects/ServerPrivate.h | 14 +- .../Ice/slicing/objects/ServerPrivateAMD.h | 14 +- .../swift/test/Ice/slicing/objects/Test.h | 20 +- .../swift/test/Ice/slicing/objects/TestAMD.h | 16 +- slice2cpp/swift/test/Ice/stream/Test.h | 58 ++-- slice2cpp/swift/test/Ice/timeout/Test.cpp | 20 +- slice2cpp/swift/test/Ice/timeout/Test.h | 22 +- slice2cpp/swift/test/Ice/udp/Test.h | 2 +- slice2cpp/swift/test/Slice/escape/Clash.h | 32 +- slice2cpp/swift/test/Slice/escape/Key.cpp | 22 +- slice2cpp/swift/test/Slice/escape/Key.h | 52 +-- slice2cs/cpp/src/IceGrid/Internal.cs | 4 +- slice2cs/cpp/test/Ice/operations/TestAMD.cs | 16 +- slice2cs/csharp/test/Ice/operations/Test.cs | 248 +++++++------- .../csharp/test/Ice/operations/TestAMD.cs | 140 ++++---- .../src/main/java/test/Ice/operations/Test.cs | 192 +++++------ .../main/java/test/Ice/operations/TestAMD.cs | 136 ++++---- slice2cs/js/test/Ice/exceptions/Test.cs | 4 +- slice2cs/js/test/Ice/operations/Test.cs | 24 +- slice2cs/matlab/test/Ice/inheritance/Test.cs | 4 +- slice2cs/matlab/test/Ice/operations/Test.cs | 112 +++---- slice2cs/php/test/Ice/operations/Test.cs | 156 ++++----- slice2cs/python/test/Ice/operations/Test.cs | 208 ++++++------ slice2cs/ruby/test/Ice/operations/Test.cs | 40 +-- slice2cs/slice/Glacier2/Router.cs | 8 +- slice2cs/swift/test/Ice/operations/Test.cs | 104 +++--- slice2cs/swift/test/Ice/operations/TestAMD.cs | 52 +-- .../IceGrid/AdapterExistsException.java | 2 +- .../IceGrid/AdapterNotActiveException.java | 2 +- .../IceGrid/InternalAdapterDescriptor.java | 2 +- .../IceGrid/InternalDbEnvDescriptor.java | 2 +- .../InternalDistributionDescriptor.java | 2 +- .../src/IceGrid/IceGrid/InternalNodeInfo.java | 2 +- .../src/IceGrid/IceGrid/InternalRegistry.java | 8 +- .../IceGrid/IceGrid/InternalRegistryPrx.java | 32 +- .../IceGrid/IceGrid/InternalReplicaInfo.java | 2 +- .../IceGrid/InternalServerDescriptor.java | 2 +- .../src/IceGrid/IceGrid/ReplicaSession.java | 4 +- .../IceGrid/IceGrid/ReplicaSessionPrx.java | 16 +- .../cpp/src/IceStorm/IceStorm/AllData.java | 2 +- .../cpp/src/IceStorm/IceStorm/EventData.java | 2 +- .../cpp/src/IceStorm/IceStorm/LinkRecord.java | 2 +- .../IceStorm/IceStorm/SubscriberRecord.java | 2 +- .../IceStorm/SubscriberRecordKey.java | 2 +- .../IceStorm/IceStormElection/GroupInfo.java | 2 +- .../IceStorm/IceStormElection/LogUpdate.java | 2 +- .../IceStorm/IceStormElection/NodeInfo.java | 2 +- .../ObserverInconsistencyException.java | 2 +- .../IceStorm/IceStormElection/QueryInfo.java | 2 +- .../IceStormElection/TopicContent.java | 2 +- .../cpp/src/icegriddb/IceGrid/AllData.java | 2 +- .../dynamicFiltering/Test/TestToken.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../test/Ice/custom/Test/BufferStruct.java | 2 +- .../Ice/custom/Test/ClassOtherStruct.java | 2 +- .../cpp/test/Ice/custom/Test/ClassStruct.java | 2 +- .../cpp/test/Ice/custom/Test/DictClass.java | 2 +- .../cpp/test/Ice/custom/Test/Fixed.java | 2 +- .../cpp/test/Ice/custom/Test/Variable.java | 2 +- .../Ice/custom/Test1/WstringException.java | 2 +- .../test/Ice/custom/Test1/WstringStruct.java | 2 +- .../Ice/custom/Test2/WstringException.java | 2 +- .../test/Ice/custom/Test2/WstringStruct.java | 2 +- .../cpp/test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../cpp/test/Ice/exceptions/Test/A.java | 2 +- .../cpp/test/Ice/exceptions/Test/B.java | 2 +- .../cpp/test/Ice/exceptions/Test/C.java | 2 +- .../cpp/test/Ice/exceptions/Test/D.java | 2 +- .../cpp/test/Ice/exceptions/Test/E.java | 2 +- .../cpp/test/Ice/exceptions/Test/F.java | 2 +- .../cpp/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/D.java | 2 +- .../Test/InvalidInputException.java | 2 +- .../cpp/test/Ice/library/Test/UserError.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B1.java | 2 +- .../cpp/test/Ice/objects/Test/Base.java | 2 +- .../cpp/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/cpp/test/Ice/objects/Test/C.java | 2 +- .../cpp/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D1.java | 2 +- .../cpp/test/Ice/objects/Test/Derived.java | 2 +- slice2java/cpp/test/Ice/objects/Test/E.java | 2 +- .../cpp/test/Ice/objects/Test/EBase.java | 2 +- .../cpp/test/Ice/objects/Test/EDerived.java | 2 +- .../cpp/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F3.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/A.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/cpp/test/Ice/objects/Test/K.java | 2 +- slice2java/cpp/test/Ice/objects/Test/L.java | 2 +- slice2java/cpp/test/Ice/objects/Test/M.java | 2 +- .../cpp/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/cpp/test/Ice/objects/Test/S.java | 2 +- .../cpp/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../cpp/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/cpp/test/Ice/optional/Test/A.java | 2 +- slice2java/cpp/test/Ice/optional/Test/B.java | 2 +- slice2java/cpp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/cpp/test/Ice/optional/Test/E.java | 2 +- slice2java/cpp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G1.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../cpp/test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../cpp/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/WD.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C2.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D1.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D3.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../cpp/test/Ice/stream/Test/ClassStruct.java | 2 +- .../cpp/test/Ice/stream/Test/MyClass.java | 2 +- .../cpp/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../cpp/test/Ice/stream/Test/SmallStruct.java | 2 +- .../stream/Test/Sub/NestedClassStruct.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedClassStruct2.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/ClassProperty.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../defaultValue/Test/ExceptionProperty.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/InnerStruct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../test/Ice/defaultValue/Test/Struct4.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../Ice/defaultValue/Test/StructProperty.java | 2 +- .../test/Ice/dictMapping/Test/TEstNv.java | 2 +- .../csharp/test/Ice/exceptions/Test/A.java | 2 +- .../csharp/test/Ice/exceptions/Test/B.java | 2 +- .../csharp/test/Ice/exceptions/Test/C.java | 2 +- .../csharp/test/Ice/exceptions/Test/D.java | 2 +- .../csharp/test/Ice/hash/Test/Color.java | 2 +- .../test/Ice/hash/Test/ColorPalette.java | 2 +- .../csharp/test/Ice/hash/Test/Draw.java | 2 +- .../Ice/hash/Test/InvalidLengthException.java | 2 +- .../Ice/hash/Test/InvalidPointException.java | 2 +- .../test/Ice/hash/Test/OtherException.java | 2 +- slice2java/csharp/test/Ice/hash/Test/Pen.java | 2 +- .../csharp/test/Ice/hash/Test/Point.java | 2 +- .../csharp/test/Ice/hash/Test/PointD.java | 2 +- .../csharp/test/Ice/hash/Test/PointF.java | 2 +- .../csharp/test/Ice/hash/Test/Polyline.java | 2 +- .../Test/InvalidInputException.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C2.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E2.java | 2 +- .../Ice/namespacemd/NoNamespace/_notify.java | 2 +- .../Ice/namespacemd/WithNamespace/C1.java | 2 +- .../Ice/namespacemd/WithNamespace/C2.java | 2 +- .../Ice/namespacemd/WithNamespace/E1.java | 2 +- .../Ice/namespacemd/WithNamespace/E2.java | 2 +- .../csharp/test/Ice/objects/Test/A.java | 2 +- .../csharp/test/Ice/objects/Test/A1.java | 2 +- .../csharp/test/Ice/objects/Test/B.java | 2 +- .../csharp/test/Ice/objects/Test/B1.java | 2 +- .../csharp/test/Ice/objects/Test/Base.java | 2 +- .../csharp/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/D.java | 2 +- .../csharp/test/Ice/objects/Test/D1.java | 2 +- .../csharp/test/Ice/objects/Test/E.java | 2 +- .../csharp/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/F.java | 2 +- .../csharp/test/Ice/objects/Test/F1.java | 2 +- .../csharp/test/Ice/objects/Test/F3.java | 2 +- .../csharp/test/Ice/objects/Test/IBase.java | 2 +- .../test/Ice/objects/Test/IDerived.java | 2 +- .../csharp/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../csharp/test/Ice/objects/Test/K.java | 2 +- .../csharp/test/Ice/objects/Test/L.java | 2 +- .../csharp/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../csharp/test/Ice/objects/Test/S.java | 2 +- .../csharp/test/Ice/objects/Test/S1.java | 2 +- .../csharp/test/Ice/objects/Test/SC1.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../csharp/test/Ice/optional/Test/A.java | 2 +- .../csharp/test/Ice/optional/Test/B.java | 2 +- .../csharp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../csharp/test/Ice/optional/Test/E.java | 2 +- .../csharp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../csharp/test/Ice/optional/Test/G.java | 2 +- .../csharp/test/Ice/optional/Test/G1.java | 2 +- .../csharp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../csharp/test/Ice/optional/Test/WD.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C2.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S2.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CR.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CV.java | 2 +- .../csharp/test/Ice/seqMapping/Test/S.java | 2 +- .../csharp/test/Ice/seqMapping/Test/SD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../csharp/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../test/Ice/stream/Test/SmallStruct.java | 2 +- .../csharp/test/Slice/escape/Clash/Cls.java | 2 +- .../csharp/test/Slice/escape/Clash/Ex.java | 2 +- .../csharp/test/Slice/escape/Clash/St.java | 2 +- .../Slice/escape/_abstract/BaseMethods.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/delegate.java | 2 +- .../test/Slice/escape/_abstract/fixed.java | 2 +- .../test/Slice/escape/_abstract/foreach.java | 2 +- .../escape/_abstract/optionalMembers.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../csharp/test/Slice/structure/Test/C.java | 2 +- .../csharp/test/Slice/structure/Test/S1.java | 2 +- .../csharp/test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../sessionHelper/Test/CallbackException.java | 2 +- .../Ice/classLoader/Test/ConcreteClass.java | 2 +- .../Ice/custom/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../test/Ice/exceptions/AMD/Test/A.java | 2 +- .../test/Ice/exceptions/AMD/Test/B.java | 2 +- .../test/Ice/exceptions/AMD/Test/C.java | 2 +- .../test/Ice/exceptions/AMD/Test/D.java | 2 +- .../test/Ice/exceptions/Test/A.java | 2 +- .../test/Ice/exceptions/Test/B.java | 2 +- .../test/Ice/exceptions/Test/C.java | 2 +- .../test/Ice/exceptions/Test/D.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Color.java | 2 +- .../hash/test/Ice/hash/Test/ColorPalette.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Draw.java | 2 +- .../test/Ice/hash/test/Ice/hash/Test/Pen.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Point.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointD.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointF.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Polyline.java | 2 +- .../Test/InvalidInputException.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B1.java | 2 +- .../objects/test/Ice/objects/Test/Base.java | 2 +- .../Ice/objects/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/E.java | 2 +- .../objects/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F3.java | 2 +- .../test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../Ice/objects/test/Ice/objects/Test/K.java | 2 +- .../Ice/objects/test/Ice/objects/Test/L.java | 2 +- .../Ice/objects/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../Ice/objects/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../operations/AMD/Test/AnotherStruct.java | 2 +- .../Ice/operations/AMD/Test/MyClass1.java | 2 +- .../Ice/operations/AMD/Test/MyStruct.java | 2 +- .../Ice/operations/AMD/Test/MyStruct1.java | 2 +- .../Ice/operations/AMD/Test/Structure.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../test/Ice/optional/AMD/Test/A.java | 2 +- .../test/Ice/optional/AMD/Test/B.java | 2 +- .../test/Ice/optional/AMD/Test/C.java | 2 +- .../Ice/optional/AMD/Test/ClassVarStruct.java | 2 +- .../optional/AMD/Test/DerivedException.java | 2 +- .../test/Ice/optional/AMD/Test/E.java | 2 +- .../test/Ice/optional/AMD/Test/F.java | 2 +- .../Ice/optional/AMD/Test/FixedStruct.java | 2 +- .../test/Ice/optional/AMD/Test/G.java | 2 +- .../test/Ice/optional/AMD/Test/G1.java | 2 +- .../test/Ice/optional/AMD/Test/G2.java | 2 +- .../Ice/optional/AMD/Test/MultiOptional.java | 2 +- .../Ice/optional/AMD/Test/OneOptional.java | 2 +- .../optional/AMD/Test/OptionalException.java | 2 +- .../optional/AMD/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/AMD/Test/Recursive.java | 2 +- .../optional/AMD/Test/RequiredException.java | 2 +- .../Ice/optional/AMD/Test/SmallStruct.java | 2 +- .../test/Ice/optional/AMD/Test/VarStruct.java | 2 +- .../test/Ice/optional/AMD/Test/WD.java | 2 +- .../optional/test/Ice/optional/Test/A.java | 2 +- .../optional/test/Ice/optional/Test/B.java | 2 +- .../optional/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../optional/test/Ice/optional/Test/E.java | 2 +- .../optional/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../optional/test/Ice/optional/Test/G.java | 2 +- .../optional/test/Ice/optional/Test/G1.java | 2 +- .../optional/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../optional/test/Ice/optional/Test/WD.java | 2 +- .../test/Ice/packagemd/Test1/C1.java | 2 +- .../test/Ice/packagemd/Test1/C2.java | 2 +- .../test/Ice/packagemd/Test1/E1.java | 2 +- .../test/Ice/packagemd/Test1/E2.java | 2 +- .../test/Ice/packagemd/Test1/_notify.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C2.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E2.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/C.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C2.java | 2 +- .../scope/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../scope/test/Ice/scope/Test/Inner/S.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/S.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S2.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Bar.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Baz.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Foo.java | 2 +- .../test/Ice/seqMapping/Test/Bar.java | 2 +- .../test/Ice/seqMapping/Test/Baz.java | 2 +- .../test/Ice/seqMapping/Test/Foo.java | 2 +- .../slicing/exceptions/client/Test/Base.java | 2 +- .../exceptions/client/Test/BaseClass.java | 2 +- .../exceptions/client/Test/KnownDerived.java | 2 +- .../client/Test/KnownIntermediate.java | 2 +- .../client/Test/KnownMostDerived.java | 2 +- .../client/Test/KnownPreserved.java | 2 +- .../client/Test/KnownPreservedDerived.java | 2 +- .../exceptions/client/Test/Preserved1.java | 2 +- .../exceptions/client/Test/Preserved2.java | 2 +- .../client/Test/PreservedClass.java | 2 +- .../slicing/exceptions/server/Test/Base.java | 2 +- .../exceptions/server/Test/BaseClass.java | 2 +- .../exceptions/server/Test/KnownDerived.java | 2 +- .../server/Test/KnownIntermediate.java | 2 +- .../server/Test/KnownMostDerived.java | 2 +- .../server/Test/KnownPreserved.java | 2 +- .../server/Test/KnownPreservedDerived.java | 2 +- .../exceptions/server/Test/SPreserved1.java | 2 +- .../exceptions/server/Test/SPreserved2.java | 2 +- .../server/Test/SPreservedClass.java | 2 +- .../server/Test/UnknownDerived.java | 2 +- .../server/Test/UnknownIntermediate.java | 2 +- .../server/Test/UnknownMostDerived1.java | 2 +- .../server/Test/UnknownMostDerived2.java | 2 +- .../exceptions/serverAMD/Test/Base.java | 2 +- .../exceptions/serverAMD/Test/BaseClass.java | 2 +- .../serverAMD/Test/KnownDerived.java | 2 +- .../serverAMD/Test/KnownIntermediate.java | 2 +- .../serverAMD/Test/KnownMostDerived.java | 2 +- .../serverAMD/Test/KnownPreserved.java | 2 +- .../serverAMD/Test/KnownPreservedDerived.java | 2 +- .../serverAMD/Test/SPreserved1.java | 2 +- .../serverAMD/Test/SPreserved2.java | 2 +- .../serverAMD/Test/SPreservedClass.java | 2 +- .../serverAMD/Test/UnknownDerived.java | 2 +- .../serverAMD/Test/UnknownIntermediate.java | 2 +- .../serverAMD/Test/UnknownMostDerived1.java | 2 +- .../serverAMD/Test/UnknownMostDerived2.java | 2 +- .../Ice/slicing/objects/client/Test/B.java | 2 +- .../objects/client/Test/BaseException.java | 2 +- .../objects/client/Test/CompactPCDerived.java | 2 +- .../objects/client/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/client/Test/D1.java | 2 +- .../Ice/slicing/objects/client/Test/D3.java | 2 +- .../objects/client/Test/DerivedException.java | 2 +- .../slicing/objects/client/Test/Forward.java | 2 +- .../slicing/objects/client/Test/Hidden.java | 2 +- .../slicing/objects/client/Test/PBase.java | 2 +- .../objects/client/Test/PCDerived.java | 2 +- .../objects/client/Test/PCDerived2.java | 2 +- .../objects/client/Test/PCDerived3.java | 2 +- .../objects/client/Test/PCUnknown.java | 2 +- .../slicing/objects/client/Test/PDerived.java | 2 +- .../slicing/objects/client/Test/PNode.java | 2 +- .../objects/client/Test/Preserved.java | 2 +- .../objects/client/Test/SBSKnownDerived.java | 2 +- .../slicing/objects/client/Test/SBase.java | 2 +- .../Ice/slicing/objects/client/Test/SS1.java | 2 +- .../Ice/slicing/objects/client/Test/SS2.java | 2 +- .../Ice/slicing/objects/client/Test/SS3.java | 2 +- .../Ice/slicing/objects/server/Test/B.java | 2 +- .../objects/server/Test/BaseException.java | 2 +- .../objects/server/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/server/Test/D1.java | 2 +- .../Ice/slicing/objects/server/Test/D2.java | 2 +- .../Ice/slicing/objects/server/Test/D4.java | 2 +- .../objects/server/Test/DerivedException.java | 2 +- .../slicing/objects/server/Test/Forward.java | 2 +- .../slicing/objects/server/Test/Hidden.java | 2 +- .../slicing/objects/server/Test/MyClass.java | 2 +- .../slicing/objects/server/Test/PBase.java | 2 +- .../slicing/objects/server/Test/PDerived.java | 2 +- .../slicing/objects/server/Test/PNode.java | 2 +- .../objects/server/Test/PSUnknown.java | 2 +- .../objects/server/Test/PSUnknown2.java | 2 +- .../server/Test/PSUnknownException.java | 2 +- .../objects/server/Test/Preserved.java | 2 +- .../objects/server/Test/SBSKnownDerived.java | 2 +- .../server/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/server/Test/SBase.java | 2 +- .../Ice/slicing/objects/server/Test/SS1.java | 2 +- .../Ice/slicing/objects/server/Test/SS2.java | 2 +- .../Ice/slicing/objects/server/Test/SS3.java | 2 +- .../slicing/objects/server/Test/SUnknown.java | 2 +- .../server/Test/UnknownDerivedException.java | 2 +- .../Ice/slicing/objects/serverAMD/Test/B.java | 2 +- .../objects/serverAMD/Test/BaseException.java | 2 +- .../slicing/objects/serverAMD/Test/D1.java | 2 +- .../slicing/objects/serverAMD/Test/D2.java | 2 +- .../slicing/objects/serverAMD/Test/D4.java | 2 +- .../serverAMD/Test/DerivedException.java | 2 +- .../objects/serverAMD/Test/Forward.java | 2 +- .../objects/serverAMD/Test/Hidden.java | 2 +- .../objects/serverAMD/Test/MyClass.java | 2 +- .../slicing/objects/serverAMD/Test/PBase.java | 2 +- .../objects/serverAMD/Test/PDerived.java | 2 +- .../slicing/objects/serverAMD/Test/PNode.java | 2 +- .../objects/serverAMD/Test/PSUnknown.java | 2 +- .../objects/serverAMD/Test/PSUnknown2.java | 2 +- .../serverAMD/Test/PSUnknownException.java | 2 +- .../objects/serverAMD/Test/Preserved.java | 2 +- .../serverAMD/Test/SBSKnownDerived.java | 2 +- .../serverAMD/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/serverAMD/Test/SBase.java | 2 +- .../slicing/objects/serverAMD/Test/SS1.java | 2 +- .../slicing/objects/serverAMD/Test/SS2.java | 2 +- .../slicing/objects/serverAMD/Test/SS3.java | 2 +- .../objects/serverAMD/Test/SUnknown.java | 2 +- .../Test/UnknownDerivedException.java | 2 +- .../stream/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../stream/test/Ice/stream/Test/Point.java | 2 +- .../test/Ice/stream/Test/SmallStruct.java | 2 +- .../escape/test/Slice/escape/Clash/Cls.java | 2 +- .../escape/test/Slice/escape/Clash/Ex.java | 2 +- .../escape/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/_else.java | 2 +- .../Slice/escape/_abstract/_hashCode.java | 2 +- .../test/Slice/escape/_abstract/_import.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/JavaOnly.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Slice/structure/Test/C.java | 2 +- .../test/Slice/structure/Test/S1.java | 2 +- .../test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../js/test/Ice/defaultValue/Test/Base.java | 2 +- .../js/test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- slice2java/js/test/Ice/exceptions/Test/A.java | 2 +- slice2java/js/test/Ice/exceptions/Test/B.java | 2 +- slice2java/js/test/Ice/exceptions/Test/C.java | 2 +- slice2java/js/test/Ice/exceptions/Test/D.java | 2 +- .../test/Ice/import/Demo/Demo/gx/Circle.java | 2 +- .../test/Ice/import/Demo/Demo/gx/Point.java | 2 +- .../test/Ice/import/Demo/Demo/gx/Square.java | 2 +- .../js/test/Ice/inheritance/Test/MC/A.java | 2 +- .../js/test/Ice/inheritance/Test/MC/B.java | 2 +- .../js/test/Ice/inheritance/Test/MC/C.java | 2 +- .../js/test/Ice/inheritance/Test/MC/D.java | 2 +- .../js/test/Ice/inheritance/Test/MD/A.java | 2 +- .../js/test/Ice/inheritance/Test/MD/B.java | 2 +- .../js/test/Ice/inheritance/Test/MD/C.java | 2 +- .../js/test/Ice/inheritance/Test/MD/D.java | 2 +- .../js/test/Ice/inheritance/Test/ME/A.java | 2 +- .../js/test/Ice/inheritance/Test/ME/B.java | 2 +- .../js/test/Ice/inheritance/Test/ME/C.java | 2 +- .../js/test/Ice/inheritance/Test/ME/D.java | 2 +- .../js/test/Ice/inheritance/Test/MF/A.java | 2 +- .../js/test/Ice/inheritance/Test/MF/B.java | 2 +- .../js/test/Ice/inheritance/Test/MF/C.java | 2 +- .../js/test/Ice/inheritance/Test/MF/D.java | 2 +- .../js/test/Ice/inheritance/Test/MG/A.java | 2 +- .../js/test/Ice/inheritance/Test/MG/B.java | 2 +- .../js/test/Ice/inheritance/Test/MG/C.java | 2 +- .../js/test/Ice/inheritance/Test/MG/D.java | 2 +- .../js/test/Ice/inheritance/Test/MH/A.java | 2 +- .../js/test/Ice/inheritance/Test/MH/B.java | 2 +- .../js/test/Ice/inheritance/Test/MH/C.java | 2 +- .../js/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/js/test/Ice/objects/Test/A.java | 2 +- slice2java/js/test/Ice/objects/Test/A1.java | 2 +- slice2java/js/test/Ice/objects/Test/B.java | 2 +- slice2java/js/test/Ice/objects/Test/B1.java | 2 +- slice2java/js/test/Ice/objects/Test/Base.java | 2 +- slice2java/js/test/Ice/objects/Test/C.java | 2 +- .../js/test/Ice/objects/Test/COneMember.java | 2 +- .../js/test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/D.java | 2 +- slice2java/js/test/Ice/objects/Test/D1.java | 2 +- slice2java/js/test/Ice/objects/Test/E.java | 2 +- .../js/test/Ice/objects/Test/EBase.java | 2 +- .../js/test/Ice/objects/Test/EDerived.java | 2 +- .../js/test/Ice/objects/Test/EOneMember.java | 2 +- .../js/test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/F.java | 2 +- slice2java/js/test/Ice/objects/Test/F1.java | 2 +- slice2java/js/test/Ice/objects/Test/F3.java | 2 +- .../js/test/Ice/objects/Test/Inner/A.java | 2 +- .../js/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../js/test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/js/test/Ice/objects/Test/K.java | 2 +- slice2java/js/test/Ice/objects/Test/L.java | 2 +- slice2java/js/test/Ice/objects/Test/M.java | 2 +- .../js/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/js/test/Ice/objects/Test/S.java | 2 +- .../js/test/Ice/objects/Test/SOneMember.java | 2 +- .../js/test/Ice/objects/Test/STwoMembers.java | 2 +- .../js/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../js/test/Ice/operations/Test/MyClass1.java | 2 +- .../js/test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/js/test/Ice/optional/Test/A.java | 2 +- slice2java/js/test/Ice/optional/Test/B.java | 2 +- slice2java/js/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/js/test/Ice/optional/Test/E.java | 2 +- slice2java/js/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/G.java | 2 +- slice2java/js/test/Ice/optional/Test/G1.java | 2 +- slice2java/js/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../js/test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../js/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/WD.java | 2 +- slice2java/js/test/Ice/scope/Test/C.java | 2 +- slice2java/js/test/Ice/scope/Test/C1.java | 2 +- slice2java/js/test/Ice/scope/Test/C2.java | 2 +- .../js/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../js/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S1.java | 2 +- slice2java/js/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/D1.java | 2 +- .../js/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS1.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS2.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS3.java | 2 +- .../js/test/Ice/stream/Test/MyClass.java | 2 +- .../js/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../js/test/Ice/stream/Test/SmallStruct.java | 2 +- .../js/test/Slice/escape/Clash/Cls.java | 2 +- slice2java/js/test/Slice/escape/Clash/Ex.java | 2 +- slice2java/js/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/await/BaseMethods.java | 2 +- .../js/test/Slice/escape/await/_break.java | 2 +- .../js/test/Slice/escape/await/_package.java | 2 +- .../js/test/Slice/escape/await/delete.java | 2 +- .../js/test/Slice/escape/await/fixed.java | 2 +- .../js/test/Slice/escape/await/foreach.java | 2 +- .../js/test/Slice/macros/Test/Default.java | 2 +- .../js/test/Slice/macros/Test/NoDefault.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../Ice/defaultValue/Test/Base.java | 2 +- .../Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/Struct1.java | 2 +- .../Ice/defaultValue/Test/Struct2.java | 2 +- .../Ice/defaultValue/Test/Struct3.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../typescript/Ice/exceptions/Test/A.java | 2 +- .../typescript/Ice/exceptions/Test/B.java | 2 +- .../typescript/Ice/exceptions/Test/C.java | 2 +- .../typescript/Ice/exceptions/Test/D.java | 2 +- .../typescript/Ice/inheritance/Test/MC/A.java | 2 +- .../typescript/Ice/inheritance/Test/MC/B.java | 2 +- .../typescript/Ice/inheritance/Test/MC/C.java | 2 +- .../typescript/Ice/inheritance/Test/MC/D.java | 2 +- .../typescript/Ice/inheritance/Test/MD/A.java | 2 +- .../typescript/Ice/inheritance/Test/MD/B.java | 2 +- .../typescript/Ice/inheritance/Test/MD/C.java | 2 +- .../typescript/Ice/inheritance/Test/MD/D.java | 2 +- .../typescript/Ice/inheritance/Test/ME/A.java | 2 +- .../typescript/Ice/inheritance/Test/ME/B.java | 2 +- .../typescript/Ice/inheritance/Test/ME/C.java | 2 +- .../typescript/Ice/inheritance/Test/ME/D.java | 2 +- .../typescript/Ice/inheritance/Test/MF/A.java | 2 +- .../typescript/Ice/inheritance/Test/MF/B.java | 2 +- .../typescript/Ice/inheritance/Test/MF/C.java | 2 +- .../typescript/Ice/inheritance/Test/MF/D.java | 2 +- .../typescript/Ice/inheritance/Test/MG/A.java | 2 +- .../typescript/Ice/inheritance/Test/MG/B.java | 2 +- .../typescript/Ice/inheritance/Test/MG/C.java | 2 +- .../typescript/Ice/inheritance/Test/MG/D.java | 2 +- .../typescript/Ice/inheritance/Test/MH/A.java | 2 +- .../typescript/Ice/inheritance/Test/MH/B.java | 2 +- .../typescript/Ice/inheritance/Test/MH/C.java | 2 +- .../typescript/Ice/inheritance/Test/MH/D.java | 2 +- .../test/typescript/Ice/objects/Test/A.java | 2 +- .../test/typescript/Ice/objects/Test/A1.java | 2 +- .../test/typescript/Ice/objects/Test/B.java | 2 +- .../test/typescript/Ice/objects/Test/B1.java | 2 +- .../typescript/Ice/objects/Test/Base.java | 2 +- .../test/typescript/Ice/objects/Test/C.java | 2 +- .../Ice/objects/Test/COneMember.java | 2 +- .../Ice/objects/Test/CTwoMembers.java | 2 +- .../test/typescript/Ice/objects/Test/D.java | 2 +- .../test/typescript/Ice/objects/Test/D1.java | 2 +- .../test/typescript/Ice/objects/Test/E.java | 2 +- .../typescript/Ice/objects/Test/EBase.java | 2 +- .../typescript/Ice/objects/Test/EDerived.java | 2 +- .../Ice/objects/Test/EOneMember.java | 2 +- .../Ice/objects/Test/ETwoMembers.java | 2 +- .../test/typescript/Ice/objects/Test/F.java | 2 +- .../test/typescript/Ice/objects/Test/F1.java | 2 +- .../test/typescript/Ice/objects/Test/F3.java | 2 +- .../typescript/Ice/objects/Test/Inner/A.java | 2 +- .../typescript/Ice/objects/Test/Inner/Ex.java | 2 +- .../Ice/objects/Test/Inner/Sub/A.java | 2 +- .../Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../test/typescript/Ice/objects/Test/K.java | 2 +- .../test/typescript/Ice/objects/Test/L.java | 2 +- .../test/typescript/Ice/objects/Test/M.java | 2 +- .../Ice/objects/Test/Recursive.java | 2 +- .../test/typescript/Ice/objects/Test/S.java | 2 +- .../Ice/objects/Test/SOneMember.java | 2 +- .../Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../Ice/operations/Test/MyClass1.java | 2 +- .../Ice/operations/Test/MyStruct.java | 2 +- .../Ice/operations/Test/MyStruct1.java | 2 +- .../Ice/operations/Test/Structure.java | 2 +- .../test/typescript/Ice/optional/Test/A.java | 2 +- .../test/typescript/Ice/optional/Test/B.java | 2 +- .../test/typescript/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../test/typescript/Ice/optional/Test/E.java | 2 +- .../test/typescript/Ice/optional/Test/F.java | 2 +- .../Ice/optional/Test/FixedStruct.java | 2 +- .../test/typescript/Ice/optional/Test/G.java | 2 +- .../test/typescript/Ice/optional/Test/G1.java | 2 +- .../test/typescript/Ice/optional/Test/G2.java | 2 +- .../Ice/optional/Test/MultiOptional.java | 2 +- .../Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../Ice/optional/Test/SmallStruct.java | 2 +- .../Ice/optional/Test/VarStruct.java | 2 +- .../test/typescript/Ice/optional/Test/WD.java | 2 +- .../js/test/typescript/Ice/scope/Test/C.java | 2 +- .../js/test/typescript/Ice/scope/Test/C1.java | 2 +- .../js/test/typescript/Ice/scope/Test/C2.java | 2 +- .../typescript/Ice/scope/Test/Inner/C.java | 2 +- .../Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../typescript/Ice/scope/Test/Inner/S.java | 2 +- .../js/test/typescript/Ice/scope/Test/S.java | 2 +- .../js/test/typescript/Ice/scope/Test/S1.java | 2 +- .../js/test/typescript/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/Test/D1.java | 2 +- .../Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../Ice/slicing/objects/Test/SBase.java | 2 +- .../Ice/slicing/objects/Test/SS1.java | 2 +- .../Ice/slicing/objects/Test/SS2.java | 2 +- .../Ice/slicing/objects/Test/SS3.java | 2 +- .../typescript/Ice/stream/Test/MyClass.java | 2 +- .../Ice/stream/Test/MyException.java | 2 +- .../Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/SmallStruct.java | 2 +- .../typescript/Slice/macros/Test/Default.java | 2 +- .../Slice/macros/Test/NoDefault.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../matlab/test/Ice/exceptions/Test/A.java | 2 +- .../matlab/test/Ice/exceptions/Test/B.java | 2 +- .../matlab/test/Ice/exceptions/Test/C.java | 2 +- .../matlab/test/Ice/exceptions/Test/D.java | 2 +- .../matlab/test/Ice/exceptions/Test/E.java | 2 +- .../matlab/test/Ice/exceptions/Test/F.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../matlab/test/Ice/objects/LocalTest/C1.java | 2 +- .../test/Ice/objects/LocalTest/CB1.java | 2 +- .../test/Ice/objects/LocalTest/CB2.java | 2 +- .../test/Ice/objects/LocalTest/CB3.java | 2 +- .../test/Ice/objects/LocalTest/CB4.java | 2 +- .../test/Ice/objects/LocalTest/CB5.java | 2 +- .../test/Ice/objects/LocalTest/CB6.java | 2 +- .../test/Ice/objects/LocalTest/CB7.java | 2 +- .../test/Ice/objects/LocalTest/CB8.java | 2 +- .../test/Ice/objects/LocalTest/Opt.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S1.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S2.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S3.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S4.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S5.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S6.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S7.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S8.java | 2 +- .../test/Ice/objects/LocalTest/StructKey.java | 2 +- .../matlab/test/Ice/objects/Test/A.java | 2 +- .../matlab/test/Ice/objects/Test/A1.java | 2 +- .../matlab/test/Ice/objects/Test/B.java | 2 +- .../matlab/test/Ice/objects/Test/B1.java | 2 +- .../matlab/test/Ice/objects/Test/Base.java | 2 +- .../matlab/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/D.java | 2 +- .../matlab/test/Ice/objects/Test/D1.java | 2 +- .../matlab/test/Ice/objects/Test/E.java | 2 +- .../matlab/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/F.java | 2 +- .../matlab/test/Ice/objects/Test/F1.java | 2 +- .../matlab/test/Ice/objects/Test/F3.java | 2 +- .../matlab/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../matlab/test/Ice/objects/Test/K.java | 2 +- .../matlab/test/Ice/objects/Test/L.java | 2 +- .../matlab/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../matlab/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../matlab/test/Ice/optional/Test/A.java | 2 +- .../matlab/test/Ice/optional/Test/B.java | 2 +- .../matlab/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../matlab/test/Ice/optional/Test/D.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../matlab/test/Ice/optional/Test/E.java | 2 +- .../matlab/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../matlab/test/Ice/optional/Test/G.java | 2 +- .../matlab/test/Ice/optional/Test/G1.java | 2 +- .../matlab/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../matlab/test/Ice/optional/Test/WD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Slice/escape/classdef/_break/_try.java | 2 +- .../Slice/escape/classdef/_break/bitor.java | 2 +- .../Slice/escape/classdef/_break/global.java | 2 +- .../Slice/escape/classdef/_break/logical.java | 2 +- .../escape/classdef/_break/persistent.java | 2 +- .../escape/classdef/_break/properties.java | 2 +- .../Slice/escape/classdef/_break/xor.java | 2 +- .../php/test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../php/test/Ice/exceptions/Test/A.java | 2 +- .../php/test/Ice/exceptions/Test/B.java | 2 +- .../php/test/Ice/exceptions/Test/C.java | 2 +- .../php/test/Ice/exceptions/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/A.java | 2 +- slice2java/php/test/Ice/objects/Test/A1.java | 2 +- slice2java/php/test/Ice/objects/Test/B.java | 2 +- slice2java/php/test/Ice/objects/Test/B1.java | 2 +- .../php/test/Ice/objects/Test/Base.java | 2 +- slice2java/php/test/Ice/objects/Test/C.java | 2 +- .../php/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/D1.java | 2 +- slice2java/php/test/Ice/objects/Test/E.java | 2 +- .../php/test/Ice/objects/Test/EBase.java | 2 +- .../php/test/Ice/objects/Test/EDerived.java | 2 +- .../php/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/F.java | 2 +- slice2java/php/test/Ice/objects/Test/F1.java | 2 +- slice2java/php/test/Ice/objects/Test/F3.java | 2 +- slice2java/php/test/Ice/objects/Test/K.java | 2 +- slice2java/php/test/Ice/objects/Test/L.java | 2 +- .../php/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/php/test/Ice/objects/Test/S.java | 2 +- .../php/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/php/test/Ice/optional/Test/A.java | 2 +- slice2java/php/test/Ice/optional/Test/B.java | 2 +- slice2java/php/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/D.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/php/test/Ice/optional/Test/E.java | 2 +- slice2java/php/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/G.java | 2 +- slice2java/php/test/Ice/optional/Test/G1.java | 2 +- slice2java/php/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../php/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/WD.java | 2 +- slice2java/php/test/Ice/scope/Test/C.java | 2 +- slice2java/php/test/Ice/scope/Test/C1.java | 2 +- slice2java/php/test/Ice/scope/Test/C2.java | 2 +- .../php/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../php/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S1.java | 2 +- slice2java/php/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/D1.java | 2 +- .../php/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../php/test/Slice/escape/Clash/Cls.java | 2 +- .../php/test/Slice/escape/Clash/Ex.java | 2 +- .../php/test/Slice/escape/Clash/St.java | 2 +- .../php/test/Slice/escape/and/echo.java | 2 +- .../php/test/Slice/escape/and/endif.java | 2 +- .../php/test/Slice/escape/and/endwhile.java | 2 +- slice2java/php/test/Slice/escape/and/xor.java | 2 +- .../php/test/Slice/macros/Test/Default.java | 2 +- .../php/test/Slice/macros/Test/NoDefault.java | 2 +- .../php/test/Slice/structure/Test/C.java | 2 +- .../php/test/Slice/structure/Test/S1.java | 2 +- .../php/test/Slice/structure/Test/S2.java | 2 +- slice2java/python/test/Ice/custom/Test/C.java | 2 +- slice2java/python/test/Ice/custom/Test/D.java | 2 +- .../python/test/Ice/custom/Test/NumPy/D.java | 2 +- slice2java/python/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../python/test/Ice/exceptions/Test/A.java | 2 +- .../python/test/Ice/exceptions/Test/B.java | 2 +- .../python/test/Ice/exceptions/Test/C.java | 2 +- .../python/test/Ice/exceptions/Test/D.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../python/test/Ice/objects/Test/A.java | 2 +- .../python/test/Ice/objects/Test/A1.java | 2 +- .../python/test/Ice/objects/Test/B.java | 2 +- .../python/test/Ice/objects/Test/B1.java | 2 +- .../python/test/Ice/objects/Test/Base.java | 2 +- .../python/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../python/test/Ice/objects/Test/D.java | 2 +- .../python/test/Ice/objects/Test/D1.java | 2 +- .../python/test/Ice/objects/Test/E.java | 2 +- .../python/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../python/test/Ice/objects/Test/F.java | 2 +- .../python/test/Ice/objects/Test/F1.java | 2 +- .../python/test/Ice/objects/Test/F3.java | 2 +- .../python/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../python/test/Ice/objects/Test/K.java | 2 +- .../python/test/Ice/objects/Test/L.java | 2 +- .../python/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../python/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../python/test/Ice/optional/Test/A.java | 2 +- .../python/test/Ice/optional/Test/B.java | 2 +- .../python/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../python/test/Ice/optional/Test/D.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../python/test/Ice/optional/Test/E.java | 2 +- .../python/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../python/test/Ice/optional/Test/G.java | 2 +- .../python/test/Ice/optional/Test/G1.java | 2 +- .../python/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../python/test/Ice/optional/Test/WD.java | 2 +- .../python/test/Ice/packagemd/Test1/C1.java | 2 +- .../python/test/Ice/packagemd/Test1/C2.java | 2 +- .../python/test/Ice/packagemd/Test1/E1.java | 2 +- .../python/test/Ice/packagemd/Test1/E2.java | 2 +- .../python/test/Ice/packagemd/Test1/def.java | 2 +- .../python/test/Ice/packagemd/Test2/C1.java | 2 +- .../python/test/Ice/packagemd/Test2/C2.java | 2 +- .../python/test/Ice/packagemd/Test2/E1.java | 2 +- .../python/test/Ice/packagemd/Test2/E2.java | 2 +- .../python/test/Ice/packagemd/Test3/C1.java | 2 +- .../python/test/Ice/packagemd/Test3/C2.java | 2 +- .../python/test/Ice/packagemd/Test3/E1.java | 2 +- .../python/test/Ice/packagemd/Test3/E2.java | 2 +- slice2java/python/test/Ice/scope/Test/C.java | 2 +- slice2java/python/test/Ice/scope/Test/C1.java | 2 +- slice2java/python/test/Ice/scope/Test/C2.java | 2 +- .../python/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../python/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S1.java | 2 +- slice2java/python/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../python/test/Slice/escape/Clash/Cls.java | 2 +- .../python/test/Slice/escape/Clash/Ex.java | 2 +- .../python/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/and/_continue.java | 2 +- .../python/test/Slice/escape/and/_for.java | 2 +- .../python/test/Slice/escape/and/is.java | 2 +- .../python/test/Slice/escape/and/not.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../python/test/Slice/structure/Test/C.java | 2 +- .../python/test/Slice/structure/Test/S1.java | 2 +- .../python/test/Slice/structure/Test/S2.java | 2 +- .../python/test/Slice/structure/Test/S3.java | 2 +- .../ruby/test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../ruby/test/Ice/exceptions/Test/A.java | 2 +- .../ruby/test/Ice/exceptions/Test/B.java | 2 +- .../ruby/test/Ice/exceptions/Test/C.java | 2 +- .../ruby/test/Ice/exceptions/Test/D.java | 2 +- .../ruby/test/Ice/exceptions/Test/Mod/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B1.java | 2 +- .../ruby/test/Ice/objects/Test/Base.java | 2 +- slice2java/ruby/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/E.java | 2 +- .../ruby/test/Ice/objects/Test/EBase.java | 2 +- .../ruby/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F3.java | 2 +- slice2java/ruby/test/Ice/objects/Test/K.java | 2 +- slice2java/ruby/test/Ice/objects/Test/L.java | 2 +- slice2java/ruby/test/Ice/objects/Test/M.java | 2 +- .../ruby/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/ruby/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../ruby/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/ruby/test/Ice/optional/Test/A.java | 2 +- slice2java/ruby/test/Ice/optional/Test/B.java | 2 +- slice2java/ruby/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- slice2java/ruby/test/Ice/optional/Test/D.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/ruby/test/Ice/optional/Test/E.java | 2 +- slice2java/ruby/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/ruby/test/Ice/optional/Test/G.java | 2 +- .../ruby/test/Ice/optional/Test/G1.java | 2 +- .../ruby/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../ruby/test/Ice/optional/Test/WD.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C2.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../ruby/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../ruby/test/Slice/escape/BEGIN/and.java | 2 +- .../ruby/test/Slice/escape/BEGIN/display.java | 2 +- .../ruby/test/Slice/escape/BEGIN/next.java | 2 +- .../ruby/test/Slice/escape/BEGIN/nil.java | 2 +- .../ruby/test/Slice/escape/Clash/Cls.java | 2 +- .../ruby/test/Slice/escape/Clash/Ex.java | 2 +- .../ruby/test/Slice/escape/Clash/St.java | 2 +- .../ruby/test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../ruby/test/Slice/structure/Test/C.java | 2 +- .../ruby/test/Slice/structure/Test/S1.java | 2 +- .../ruby/test/Slice/structure/Test/S2.java | 2 +- 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 +- .../Glacier2/PermissionDeniedException.java | 2 +- .../Glacier2/com/zeroc/Glacier2/SSLInfo.java | 2 +- .../com/zeroc/IceMX/SessionMetrics.java | 2 +- .../Ice/com/zeroc/Ice/EncodingVersion.java | 2 +- .../slice/Ice/com/zeroc/Ice/Identity.java | 2 +- .../slice/Ice/com/zeroc/Ice/LogMessage.java | 2 +- .../Ice/com/zeroc/Ice/ProtocolVersion.java | 2 +- .../zeroc/IceMX/ChildInvocationMetrics.java | 2 +- .../com/zeroc/IceMX/ConnectionMetrics.java | 2 +- .../Ice/com/zeroc/IceMX/DispatchMetrics.java | 2 +- .../com/zeroc/IceMX/InvocationMetrics.java | 2 +- .../slice/Ice/com/zeroc/IceMX/Metrics.java | 2 +- .../Ice/com/zeroc/IceMX/MetricsFailures.java | 2 +- .../Ice/com/zeroc/IceMX/ThreadMetrics.java | 2 +- .../zeroc/IceGrid/AccessDeniedException.java | 2 +- .../com/zeroc/IceGrid/AdapterDescriptor.java | 2 +- .../com/zeroc/IceGrid/AdapterDynamicInfo.java | 2 +- .../com/zeroc/IceGrid/AdapterInfo.java | 2 +- .../IceGrid/AdapterNotExistException.java | 2 +- .../IceGrid/AdaptiveLoadBalancingPolicy.java | 2 +- .../zeroc/IceGrid/AllocationException.java | 2 +- .../zeroc/IceGrid/ApplicationDescriptor.java | 2 +- .../com/zeroc/IceGrid/ApplicationInfo.java | 2 +- .../IceGrid/ApplicationNotExistException.java | 2 +- .../IceGrid/ApplicationUpdateDescriptor.java | 2 +- .../zeroc/IceGrid/ApplicationUpdateInfo.java | 2 +- .../com/zeroc/IceGrid/BadSignalException.java | 2 +- .../IceGrid/BoxedDistributionDescriptor.java | 2 +- .../com/zeroc/IceGrid/BoxedString.java | 2 +- .../zeroc/IceGrid/CommunicatorDescriptor.java | 2 +- .../zeroc/IceGrid/DeploymentException.java | 2 +- .../zeroc/IceGrid/DistributionDescriptor.java | 2 +- .../IceGrid/FileNotAvailableException.java | 2 +- .../com/zeroc/IceGrid/IceBoxDescriptor.java | 2 +- .../zeroc/IceGrid/LoadBalancingPolicy.java | 2 +- .../IceGrid/com/zeroc/IceGrid/LoadInfo.java | 2 +- .../com/zeroc/IceGrid/NodeDescriptor.java | 2 +- .../com/zeroc/IceGrid/NodeDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/NodeInfo.java | 2 +- .../zeroc/IceGrid/NodeNotExistException.java | 2 +- .../IceGrid/NodeUnreachableException.java | 2 +- .../zeroc/IceGrid/NodeUpdateDescriptor.java | 2 +- .../com/zeroc/IceGrid/ObjectDescriptor.java | 2 +- .../zeroc/IceGrid/ObjectExistsException.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ObjectInfo.java | 2 +- .../IceGrid/ObjectNotRegisteredException.java | 2 +- .../ObserverAlreadyRegisteredException.java | 2 +- .../com/zeroc/IceGrid/ParseException.java | 2 +- .../com/zeroc/IceGrid/PatchException.java | 2 +- .../IceGrid/PermissionDeniedException.java | 2 +- .../com/zeroc/IceGrid/PropertyDescriptor.java | 2 +- .../zeroc/IceGrid/PropertySetDescriptor.java | 2 +- .../com/zeroc/IceGrid/RegistryInfo.java | 2 +- .../IceGrid/RegistryNotExistException.java | 2 +- .../IceGrid/RegistryUnreachableException.java | 2 +- .../zeroc/IceGrid/ReplicaGroupDescriptor.java | 2 +- .../com/zeroc/IceGrid/ServerDescriptor.java | 2 +- .../com/zeroc/IceGrid/ServerDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ServerInfo.java | 2 +- .../IceGrid/ServerInstanceDescriptor.java | 2 +- .../IceGrid/ServerNotExistException.java | 2 +- .../zeroc/IceGrid/ServerStartException.java | 2 +- .../zeroc/IceGrid/ServerStopException.java | 2 +- .../IceGrid/ServerUnreachableException.java | 2 +- .../com/zeroc/IceGrid/ServiceDescriptor.java | 2 +- .../IceGrid/ServiceInstanceDescriptor.java | 2 +- .../com/zeroc/IceGrid/TemplateDescriptor.java | 2 +- .../zeroc/IcePatch2/FileAccessException.java | 2 +- .../com/zeroc/IcePatch2/FileInfo.java | 2 +- .../com/zeroc/IcePatch2/LargeFileInfo.java | 2 +- .../com/zeroc/IceMX/SubscriberMetrics.java | 2 +- .../com/zeroc/IceMX/TopicMetrics.java | 2 +- .../IceStorm/com/zeroc/IceStorm/BadQoS.java | 2 +- .../com/zeroc/IceStorm/InvalidSubscriber.java | 2 +- .../com/zeroc/IceStorm/LinkExists.java | 2 +- .../IceStorm/com/zeroc/IceStorm/LinkInfo.java | 2 +- .../com/zeroc/IceStorm/NoSuchLink.java | 2 +- .../com/zeroc/IceStorm/NoSuchTopic.java | 2 +- .../com/zeroc/IceStorm/TopicExists.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../swift/test/Ice/exceptions/Test/A.java | 2 +- .../swift/test/Ice/exceptions/Test/B.java | 2 +- .../swift/test/Ice/exceptions/Test/C.java | 2 +- .../swift/test/Ice/exceptions/Test/D.java | 2 +- .../swift/test/Ice/exceptions/Test/E.java | 2 +- .../swift/test/Ice/exceptions/Test/F.java | 2 +- .../swift/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/D.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/A.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/B.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/C.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/D.java | 2 +- .../Test/InvalidInputException.java | 2 +- slice2java/swift/test/Ice/objects/Test/A.java | 2 +- .../swift/test/Ice/objects/Test/A1.java | 2 +- slice2java/swift/test/Ice/objects/Test/B.java | 2 +- .../swift/test/Ice/objects/Test/B1.java | 2 +- .../swift/test/Ice/objects/Test/Base.java | 2 +- .../swift/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/swift/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/D.java | 2 +- .../swift/test/Ice/objects/Test/D1.java | 2 +- .../swift/test/Ice/objects/Test/Derived.java | 2 +- slice2java/swift/test/Ice/objects/Test/E.java | 2 +- .../swift/test/Ice/objects/Test/EBase.java | 2 +- .../swift/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/F.java | 2 +- .../swift/test/Ice/objects/Test/F1.java | 2 +- .../swift/test/Ice/objects/Test/F3.java | 2 +- .../swift/test/Ice/objects/Test/Inner/A.java | 2 +- .../swift/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/swift/test/Ice/objects/Test/K.java | 2 +- slice2java/swift/test/Ice/objects/Test/L.java | 2 +- slice2java/swift/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- slice2java/swift/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../swift/test/Ice/optional/Test/A.java | 2 +- .../swift/test/Ice/optional/Test/B.java | 2 +- .../swift/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/ClassVarStruct.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../swift/test/Ice/optional/Test/E.java | 2 +- .../swift/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../swift/test/Ice/optional/Test/G.java | 2 +- .../swift/test/Ice/optional/Test/G1.java | 2 +- .../swift/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../test/Ice/optional/Test/Recursive.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../swift/test/Ice/optional/Test/WD.java | 2 +- slice2java/swift/test/Ice/scope/Test/C.java | 2 +- slice2java/swift/test/Ice/scope/Test/C1.java | 2 +- slice2java/swift/test/Ice/scope/Test/C2.java | 2 +- .../swift/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../swift/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S1.java | 2 +- slice2java/swift/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../slicing/exceptions/Test/SPreserved1.java | 2 +- .../slicing/exceptions/Test/SPreserved2.java | 2 +- .../exceptions/Test/SPreservedClass.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/ClassStruct.java | 2 +- .../swift/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../test/Ice/stream/Test/SmallStruct.java | 2 +- .../stream/Test/Sub/NestedClassStruct.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedClassStruct2.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../swift/test/Slice/escape/Clash/Cls.java | 2 +- .../swift/test/Slice/escape/Clash/Ex.java | 2 +- .../swift/test/Slice/escape/Clash/St.java | 2 +- .../swift/test/Slice/escape/and/_return.java | 2 +- .../swift/test/Slice/escape/and/_switch.java | 2 +- .../swift/test/Slice/escape/and/as.java | 2 +- .../swift/test/Slice/escape/and/defer.java | 2 +- .../swift/test/Slice/escape/and/guard.java | 2 +- slice2js/cpp/src/IceGrid/Internal.js | 12 +- slice2js/slice/Glacier2/Router.js | 8 +- .../slice/Glacier2/+Glacier2/RouterPrx.m | 4 +- .../slice/IceGrid/+IceGrid/AdminPrx.m | 24 +- .../slice/IceGrid/+IceGrid/AdminSessionPrx.m | 14 +- slice2swift/cpp/src/IceGrid/Internal.swift | 8 +- .../java/test/Ice/servantLocator/Test.swift | 24 +- slice2swift/slice/Glacier2/Router.swift | 16 +- slice2swift/slice/IceGrid/Admin.swift | 312 +++++++++--------- 2204 files changed, 15871 insertions(+), 15871 deletions(-) diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp index b96c21981844..8948ec1a5265 100644 --- a/slice2cpp/cpp/src/IceGrid/Internal.cpp +++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp @@ -461,31 +461,31 @@ IceGrid::AdapterPrx::ice_staticId() return Adapter::ice_staticId(); } -long long int -IceGrid::FileReaderPrx::getOffsetFromEnd(const ::std::string& iceP_filename, int iceP_lines, const ::Ice::Context& context) const +::std::int64_t +IceGrid::FileReaderPrx::getOffsetFromEnd(const ::std::string& iceP_filename, ::std::int32_t iceP_lines, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &FileReaderPrx::_iceI_getOffsetFromEnd, iceP_filename, iceP_lines, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &FileReaderPrx::_iceI_getOffsetFromEnd, iceP_filename, iceP_lines, context).get(); } -::std::future -IceGrid::FileReaderPrx::getOffsetFromEndAsync(const ::std::string& iceP_filename, int iceP_lines, const ::Ice::Context& context) const +::std::future<::std::int64_t> +IceGrid::FileReaderPrx::getOffsetFromEndAsync(const ::std::string& iceP_filename, ::std::int32_t iceP_lines, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &FileReaderPrx::_iceI_getOffsetFromEnd, iceP_filename, iceP_lines, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &FileReaderPrx::_iceI_getOffsetFromEnd, iceP_filename, iceP_lines, context); } ::std::function -IceGrid::FileReaderPrx::getOffsetFromEndAsync(const ::std::string& iceP_filename, int iceP_lines, - ::std::function response, +IceGrid::FileReaderPrx::getOffsetFromEndAsync(const ::std::string& iceP_filename, ::std::int32_t iceP_lines, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::FileReaderPrx::_iceI_getOffsetFromEnd, iceP_filename, iceP_lines, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::FileReaderPrx::_iceI_getOffsetFromEnd, iceP_filename, iceP_lines, context); } /// \cond INTERNAL void -IceGrid::FileReaderPrx::_iceI_getOffsetFromEnd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_filename, int iceP_lines, const ::Ice::Context& context) const +IceGrid::FileReaderPrx::_iceI_getOffsetFromEnd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, const ::std::string& iceP_filename, ::std::int32_t iceP_lines, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_FileReader_getOffsetFromEnd_name); outAsync->invoke(iceC_IceGrid_FileReader_getOffsetFromEnd_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -511,37 +511,37 @@ IceGrid::FileReaderPrx::_iceI_getOffsetFromEnd(const ::std::shared_ptr<::IceInte /// \endcond bool -IceGrid::FileReaderPrx::read(const ::std::string& iceP_filename, long long int iceP_pos, int iceP_size, long long int& iceP_newPos, ::Ice::StringSeq& iceP_lines, const ::Ice::Context& context) const +IceGrid::FileReaderPrx::read(const ::std::string& iceP_filename, ::std::int64_t iceP_pos, ::std::int32_t iceP_size, ::std::int64_t& iceP_newPos, ::Ice::StringSeq& iceP_lines, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &FileReaderPrx::_iceI_read, iceP_filename, iceP_pos, iceP_size, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &FileReaderPrx::_iceI_read, iceP_filename, iceP_pos, iceP_size, context).get(); iceP_newPos = ::std::get<1>(_result); iceP_lines = ::std::move(::std::get<2>(_result)); return ::std::get<0>(_result); } -::std::future<::std::tuple> -IceGrid::FileReaderPrx::readAsync(const ::std::string& iceP_filename, long long int iceP_pos, int iceP_size, const ::Ice::Context& context) const +::std::future<::std::tuple> +IceGrid::FileReaderPrx::readAsync(const ::std::string& iceP_filename, ::std::int64_t iceP_pos, ::std::int32_t iceP_size, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &FileReaderPrx::_iceI_read, iceP_filename, iceP_pos, iceP_size, context); + return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &FileReaderPrx::_iceI_read, iceP_filename, iceP_pos, iceP_size, context); } ::std::function -IceGrid::FileReaderPrx::readAsync(const ::std::string& iceP_filename, long long int iceP_pos, int iceP_size, - ::std::function response, +IceGrid::FileReaderPrx::readAsync(const ::std::string& iceP_filename, ::std::int64_t iceP_pos, ::std::int32_t iceP_size, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::move(::std::get<2>(_result))); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::FileReaderPrx::_iceI_read, iceP_filename, iceP_pos, iceP_size, context); + return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::FileReaderPrx::_iceI_read, iceP_filename, iceP_pos, iceP_size, context); } /// \cond INTERNAL void -IceGrid::FileReaderPrx::_iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::std::string& iceP_filename, long long int iceP_pos, int iceP_size, const ::Ice::Context& context) const +IceGrid::FileReaderPrx::_iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::std::string& iceP_filename, ::std::int64_t iceP_pos, ::std::int32_t iceP_size, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_FileReader_read_name); outAsync->invoke(iceC_IceGrid_FileReader_read_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -565,7 +565,7 @@ IceGrid::FileReaderPrx::_iceI_read(const ::std::shared_ptr<::IceInternal::Outgoi }, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<0>(v)); return v; }); @@ -835,19 +835,19 @@ IceGrid::ServerPrx::_iceI_sendSignal(const ::std::shared_ptr<::IceInternal::Outg /// \endcond void -IceGrid::ServerPrx::writeMessage(const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context) const +IceGrid::ServerPrx::writeMessage(const ::std::string& iceP_message, ::std::int32_t iceP_fd, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ServerPrx::_iceI_writeMessage, iceP_message, iceP_fd, context).get(); } ::std::future -IceGrid::ServerPrx::writeMessageAsync(const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context) const +IceGrid::ServerPrx::writeMessageAsync(const ::std::string& iceP_message, ::std::int32_t iceP_fd, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ServerPrx::_iceI_writeMessage, iceP_message, iceP_fd, context); } ::std::function -IceGrid::ServerPrx::writeMessageAsync(const ::std::string& iceP_message, int iceP_fd, +IceGrid::ServerPrx::writeMessageAsync(const ::std::string& iceP_message, ::std::int32_t iceP_fd, ::std::function response, ::std::function ex, ::std::function sent, @@ -858,7 +858,7 @@ IceGrid::ServerPrx::writeMessageAsync(const ::std::string& iceP_message, int ice /// \cond INTERNAL void -IceGrid::ServerPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context) const +IceGrid::ServerPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_message, ::std::int32_t iceP_fd, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_Server_writeMessage_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -901,30 +901,30 @@ IceGrid::ServerPrx::_iceI_getState(const ::std::shared_ptr<::IceInternal::Outgoi } /// \endcond -int +::std::int32_t IceGrid::ServerPrx::getPid(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &ServerPrx::_iceI_getPid, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &ServerPrx::_iceI_getPid, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::ServerPrx::getPidAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &ServerPrx::_iceI_getPid, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &ServerPrx::_iceI_getPid, context); } ::std::function -IceGrid::ServerPrx::getPidAsync(::std::function response, +IceGrid::ServerPrx::getPidAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::ServerPrx::_iceI_getPid, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::ServerPrx::_iceI_getPid, context); } /// \cond INTERNAL void -IceGrid::ServerPrx::_iceI_getPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::ServerPrx::_iceI_getPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Server_getPid_name); outAsync->invoke(iceC_IceGrid_Server_getPid_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -1158,38 +1158,38 @@ IceGrid::PatcherFeedbackPrx::ice_staticId() } ::std::optional<::IceGrid::ServerPrx> -IceGrid::NodePrx::loadServer(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, AdapterPrxDict& iceP_adapters, int& iceP_actTimeout, int& iceP_deactTimeout, const ::Ice::Context& context) const +IceGrid::NodePrx::loadServer(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, AdapterPrxDict& iceP_adapters, ::std::int32_t& iceP_actTimeout, ::std::int32_t& iceP_deactTimeout, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, int, int>>(true, this, &NodePrx::_iceI_loadServer, iceP_svr, iceP_replicaName, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>(true, this, &NodePrx::_iceI_loadServer, iceP_svr, iceP_replicaName, context).get(); iceP_adapters = ::std::move(::std::get<1>(_result)); iceP_actTimeout = ::std::get<2>(_result); iceP_deactTimeout = ::std::get<3>(_result); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::std::optional<::IceGrid::ServerPrx>, ::IceGrid::AdapterPrxDict, int, int>> +::std::future<::std::tuple<::std::optional<::IceGrid::ServerPrx>, ::IceGrid::AdapterPrxDict, ::std::int32_t, ::std::int32_t>> IceGrid::NodePrx::loadServerAsync(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, int, int>, ::std::promise>(false, this, &NodePrx::_iceI_loadServer, iceP_svr, iceP_replicaName, context); + return _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &NodePrx::_iceI_loadServer, iceP_svr, iceP_replicaName, context); } ::std::function IceGrid::NodePrx::loadServerAsync(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, - ::std::function, ::IceGrid::AdapterPrxDict, int, int)> response, + ::std::function, ::IceGrid::AdapterPrxDict, ::std::int32_t, ::std::int32_t)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::std::optional, AdapterPrxDict, int, int>&& _result) + auto _responseCb = [response](::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result)), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::std::optional, AdapterPrxDict, int, int>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::NodePrx::_iceI_loadServer, iceP_svr, iceP_replicaName, context); + return _makeLambdaOutgoing<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::NodePrx::_iceI_loadServer, iceP_svr, iceP_replicaName, context); } /// \cond INTERNAL void -IceGrid::NodePrx::_iceI_loadServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, int, int>>>& outAsync, const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::_iceI_loadServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>>& outAsync, const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Node_loadServer_name); outAsync->invoke(iceC_IceGrid_Node_loadServer_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -1214,7 +1214,7 @@ IceGrid::NodePrx::_iceI_loadServer(const ::std::shared_ptr<::IceInternal::Outgoi }, [](::Ice::InputStream* istr) { - ::std::tuple<::std::optional, AdapterPrxDict, int, int> v; + ::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -1222,38 +1222,38 @@ IceGrid::NodePrx::_iceI_loadServer(const ::std::shared_ptr<::IceInternal::Outgoi /// \endcond ::std::optional<::IceGrid::ServerPrx> -IceGrid::NodePrx::loadServerWithoutRestart(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, AdapterPrxDict& iceP_adapters, int& iceP_actTimeout, int& iceP_deactTimeout, const ::Ice::Context& context) const +IceGrid::NodePrx::loadServerWithoutRestart(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, AdapterPrxDict& iceP_adapters, ::std::int32_t& iceP_actTimeout, ::std::int32_t& iceP_deactTimeout, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, int, int>>(true, this, &NodePrx::_iceI_loadServerWithoutRestart, iceP_svr, iceP_replicaName, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>(true, this, &NodePrx::_iceI_loadServerWithoutRestart, iceP_svr, iceP_replicaName, context).get(); iceP_adapters = ::std::move(::std::get<1>(_result)); iceP_actTimeout = ::std::get<2>(_result); iceP_deactTimeout = ::std::get<3>(_result); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::std::optional<::IceGrid::ServerPrx>, ::IceGrid::AdapterPrxDict, int, int>> +::std::future<::std::tuple<::std::optional<::IceGrid::ServerPrx>, ::IceGrid::AdapterPrxDict, ::std::int32_t, ::std::int32_t>> IceGrid::NodePrx::loadServerWithoutRestartAsync(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, int, int>, ::std::promise>(false, this, &NodePrx::_iceI_loadServerWithoutRestart, iceP_svr, iceP_replicaName, context); + return _makePromiseOutgoing<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &NodePrx::_iceI_loadServerWithoutRestart, iceP_svr, iceP_replicaName, context); } ::std::function IceGrid::NodePrx::loadServerWithoutRestartAsync(const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, - ::std::function, ::IceGrid::AdapterPrxDict, int, int)> response, + ::std::function, ::IceGrid::AdapterPrxDict, ::std::int32_t, ::std::int32_t)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::std::optional, AdapterPrxDict, int, int>&& _result) + auto _responseCb = [response](::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result)), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::std::optional, AdapterPrxDict, int, int>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::NodePrx::_iceI_loadServerWithoutRestart, iceP_svr, iceP_replicaName, context); + return _makeLambdaOutgoing<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::NodePrx::_iceI_loadServerWithoutRestart, iceP_svr, iceP_replicaName, context); } /// \cond INTERNAL void -IceGrid::NodePrx::_iceI_loadServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, int, int>>>& outAsync, const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::_iceI_loadServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>>& outAsync, const ::std::shared_ptr& iceP_svr, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Node_loadServerWithoutRestart_name); outAsync->invoke(iceC_IceGrid_Node_loadServerWithoutRestart_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -1278,7 +1278,7 @@ IceGrid::NodePrx::_iceI_loadServerWithoutRestart(const ::std::shared_ptr<::IceIn }, [](::Ice::InputStream* istr) { - ::std::tuple<::std::optional, AdapterPrxDict, int, int> v; + ::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -1286,19 +1286,19 @@ IceGrid::NodePrx::_iceI_loadServerWithoutRestart(const ::std::shared_ptr<::IceIn /// \endcond void -IceGrid::NodePrx::destroyServer(const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::destroyServer(const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &NodePrx::_iceI_destroyServer, iceP_name, iceP_uuid, iceP_revision, iceP_replicaName, context).get(); } ::std::future -IceGrid::NodePrx::destroyServerAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::destroyServerAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodePrx::_iceI_destroyServer, iceP_name, iceP_uuid, iceP_revision, iceP_replicaName, context); } ::std::function -IceGrid::NodePrx::destroyServerAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, +IceGrid::NodePrx::destroyServerAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, ::std::function response, ::std::function ex, ::std::function sent, @@ -1309,7 +1309,7 @@ IceGrid::NodePrx::destroyServerAsync(const ::std::string& iceP_name, const ::std /// \cond INTERNAL void -IceGrid::NodePrx::_iceI_destroyServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::_iceI_destroyServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Node_destroyServer_name); outAsync->invoke(iceC_IceGrid_Node_destroyServer_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -1335,19 +1335,19 @@ IceGrid::NodePrx::_iceI_destroyServer(const ::std::shared_ptr<::IceInternal::Out /// \endcond void -IceGrid::NodePrx::destroyServerWithoutRestart(const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::destroyServerWithoutRestart(const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &NodePrx::_iceI_destroyServerWithoutRestart, iceP_name, iceP_uuid, iceP_revision, iceP_replicaName, context).get(); } ::std::future -IceGrid::NodePrx::destroyServerWithoutRestartAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::destroyServerWithoutRestartAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodePrx::_iceI_destroyServerWithoutRestart, iceP_name, iceP_uuid, iceP_revision, iceP_replicaName, context); } ::std::function -IceGrid::NodePrx::destroyServerWithoutRestartAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, +IceGrid::NodePrx::destroyServerWithoutRestartAsync(const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, ::std::function response, ::std::function ex, ::std::function sent, @@ -1358,7 +1358,7 @@ IceGrid::NodePrx::destroyServerWithoutRestartAsync(const ::std::string& iceP_nam /// \cond INTERNAL void -IceGrid::NodePrx::_iceI_destroyServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_name, const ::std::string& iceP_uuid, int iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const +IceGrid::NodePrx::_iceI_destroyServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_name, const ::std::string& iceP_uuid, ::std::int32_t iceP_revision, const ::std::string& iceP_replicaName, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Node_destroyServerWithoutRestart_name); outAsync->invoke(iceC_IceGrid_Node_destroyServerWithoutRestart_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -1550,30 +1550,30 @@ IceGrid::NodePrx::_iceI_getLoad(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int +::std::int32_t IceGrid::NodePrx::getProcessorSocketCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &NodePrx::_iceI_getProcessorSocketCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &NodePrx::_iceI_getProcessorSocketCount, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::NodePrx::getProcessorSocketCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &NodePrx::_iceI_getProcessorSocketCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &NodePrx::_iceI_getProcessorSocketCount, context); } ::std::function -IceGrid::NodePrx::getProcessorSocketCountAsync(::std::function response, +IceGrid::NodePrx::getProcessorSocketCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::NodePrx::_iceI_getProcessorSocketCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::NodePrx::_iceI_getProcessorSocketCount, context); } /// \cond INTERNAL void -IceGrid::NodePrx::_iceI_getProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::NodePrx::_iceI_getProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Node_getProcessorSocketCount_name); outAsync->invoke(iceC_IceGrid_Node_getProcessorSocketCount_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -1689,30 +1689,30 @@ IceGrid::NodeSessionPrx::_iceI_setReplicaObserver(const ::std::shared_ptr<::IceI } /// \endcond -int +::std::int32_t IceGrid::NodeSessionPrx::getTimeout(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &NodeSessionPrx::_iceI_getTimeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &NodeSessionPrx::_iceI_getTimeout, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::NodeSessionPrx::getTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &NodeSessionPrx::_iceI_getTimeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &NodeSessionPrx::_iceI_getTimeout, context); } ::std::function -IceGrid::NodeSessionPrx::getTimeoutAsync(::std::function response, +IceGrid::NodeSessionPrx::getTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::NodeSessionPrx::_iceI_getTimeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::NodeSessionPrx::_iceI_getTimeout, context); } /// \cond INTERNAL void -IceGrid::NodeSessionPrx::_iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::NodeSessionPrx::_iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_NodeSession_getTimeout_name); outAsync->invoke(iceC_IceGrid_NodeSession_getTimeout_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -1817,19 +1817,19 @@ IceGrid::NodeSessionPrx::_iceI_getServers(const ::std::shared_ptr<::IceInternal: /// \endcond void -IceGrid::NodeSessionPrx::waitForApplicationUpdate(const ::std::string& iceP_application, int iceP_revision, const ::Ice::Context& context) const +IceGrid::NodeSessionPrx::waitForApplicationUpdate(const ::std::string& iceP_application, ::std::int32_t iceP_revision, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &NodeSessionPrx::_iceI_waitForApplicationUpdate, iceP_application, iceP_revision, context).get(); } ::std::future -IceGrid::NodeSessionPrx::waitForApplicationUpdateAsync(const ::std::string& iceP_application, int iceP_revision, const ::Ice::Context& context) const +IceGrid::NodeSessionPrx::waitForApplicationUpdateAsync(const ::std::string& iceP_application, ::std::int32_t iceP_revision, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodeSessionPrx::_iceI_waitForApplicationUpdate, iceP_application, iceP_revision, context); } ::std::function -IceGrid::NodeSessionPrx::waitForApplicationUpdateAsync(const ::std::string& iceP_application, int iceP_revision, +IceGrid::NodeSessionPrx::waitForApplicationUpdateAsync(const ::std::string& iceP_application, ::std::int32_t iceP_revision, ::std::function response, ::std::function ex, ::std::function sent, @@ -1840,7 +1840,7 @@ IceGrid::NodeSessionPrx::waitForApplicationUpdateAsync(const ::std::string& iceP /// \cond INTERNAL void -IceGrid::NodeSessionPrx::_iceI_waitForApplicationUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_application, int iceP_revision, const ::Ice::Context& context) const +IceGrid::NodeSessionPrx::_iceI_waitForApplicationUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_application, ::std::int32_t iceP_revision, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_NodeSession_waitForApplicationUpdate_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1925,30 +1925,30 @@ IceGrid::ReplicaSessionPrx::_iceI_keepAlive(const ::std::shared_ptr<::IceInterna } /// \endcond -int +::std::int32_t IceGrid::ReplicaSessionPrx::getTimeout(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &ReplicaSessionPrx::_iceI_getTimeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &ReplicaSessionPrx::_iceI_getTimeout, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::ReplicaSessionPrx::getTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &ReplicaSessionPrx::_iceI_getTimeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &ReplicaSessionPrx::_iceI_getTimeout, context); } ::std::function -IceGrid::ReplicaSessionPrx::getTimeoutAsync(::std::function response, +IceGrid::ReplicaSessionPrx::getTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::ReplicaSessionPrx::_iceI_getTimeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::ReplicaSessionPrx::_iceI_getTimeout, context); } /// \cond INTERNAL void -IceGrid::ReplicaSessionPrx::_iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::ReplicaSessionPrx::_iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_ReplicaSession_getTimeout_name); outAsync->invoke(iceC_IceGrid_ReplicaSession_getTimeout_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -2135,19 +2135,19 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr< /// \endcond void -IceGrid::ReplicaSessionPrx::receivedUpdate(TopicName iceP_name, int iceP_serial, const ::std::string& iceP_failure, const ::Ice::Context& context) const +IceGrid::ReplicaSessionPrx::receivedUpdate(TopicName iceP_name, ::std::int32_t iceP_serial, const ::std::string& iceP_failure, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ReplicaSessionPrx::_iceI_receivedUpdate, iceP_name, iceP_serial, iceP_failure, context).get(); } ::std::future -IceGrid::ReplicaSessionPrx::receivedUpdateAsync(TopicName iceP_name, int iceP_serial, const ::std::string& iceP_failure, const ::Ice::Context& context) const +IceGrid::ReplicaSessionPrx::receivedUpdateAsync(TopicName iceP_name, ::std::int32_t iceP_serial, const ::std::string& iceP_failure, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ReplicaSessionPrx::_iceI_receivedUpdate, iceP_name, iceP_serial, iceP_failure, context); } ::std::function -IceGrid::ReplicaSessionPrx::receivedUpdateAsync(TopicName iceP_name, int iceP_serial, const ::std::string& iceP_failure, +IceGrid::ReplicaSessionPrx::receivedUpdateAsync(TopicName iceP_name, ::std::int32_t iceP_serial, const ::std::string& iceP_failure, ::std::function response, ::std::function ex, ::std::function sent, @@ -2158,7 +2158,7 @@ IceGrid::ReplicaSessionPrx::receivedUpdateAsync(TopicName iceP_name, int iceP_se /// \cond INTERNAL void -IceGrid::ReplicaSessionPrx::_iceI_receivedUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, TopicName iceP_name, int iceP_serial, const ::std::string& iceP_failure, const ::Ice::Context& context) const +IceGrid::ReplicaSessionPrx::_iceI_receivedUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, TopicName iceP_name, ::std::int32_t iceP_serial, const ::std::string& iceP_failure, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_ReplicaSession_receivedUpdate_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -2414,35 +2414,35 @@ IceGrid::InternalRegistryPrx::_iceI_getReplicas(const ::std::shared_ptr<::IceInt /// \endcond ::IceGrid::ApplicationInfoSeq -IceGrid::InternalRegistryPrx::getApplications(long long int& iceP_serial, const ::Ice::Context& context) const +IceGrid::InternalRegistryPrx::getApplications(::std::int64_t& iceP_serial, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &InternalRegistryPrx::_iceI_getApplications, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &InternalRegistryPrx::_iceI_getApplications, context).get(); iceP_serial = ::std::get<1>(_result); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::IceGrid::ApplicationInfoSeq, long long int>> +::std::future<::std::tuple<::IceGrid::ApplicationInfoSeq, ::std::int64_t>> IceGrid::InternalRegistryPrx::getApplicationsAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &InternalRegistryPrx::_iceI_getApplications, context); + return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &InternalRegistryPrx::_iceI_getApplications, context); } ::std::function -IceGrid::InternalRegistryPrx::getApplicationsAsync(::std::function response, +IceGrid::InternalRegistryPrx::getApplicationsAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple&& _result) { response(::std::move(::std::get<0>(_result)), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::InternalRegistryPrx::_iceI_getApplications, context); + return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::InternalRegistryPrx::_iceI_getApplications, context); } /// \cond INTERNAL void -IceGrid::InternalRegistryPrx::_iceI_getApplications(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const +IceGrid::InternalRegistryPrx::_iceI_getApplications(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_InternalRegistry_getApplications_name); outAsync->invoke(iceC_IceGrid_InternalRegistry_getApplications_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -2450,7 +2450,7 @@ IceGrid::InternalRegistryPrx::_iceI_getApplications(const ::std::shared_ptr<::Ic nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); istr->readPendingValues(); return v; @@ -2459,35 +2459,35 @@ IceGrid::InternalRegistryPrx::_iceI_getApplications(const ::std::shared_ptr<::Ic /// \endcond ::IceGrid::AdapterInfoSeq -IceGrid::InternalRegistryPrx::getAdapters(long long int& iceP_serial, const ::Ice::Context& context) const +IceGrid::InternalRegistryPrx::getAdapters(::std::int64_t& iceP_serial, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &InternalRegistryPrx::_iceI_getAdapters, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &InternalRegistryPrx::_iceI_getAdapters, context).get(); iceP_serial = ::std::get<1>(_result); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::IceGrid::AdapterInfoSeq, long long int>> +::std::future<::std::tuple<::IceGrid::AdapterInfoSeq, ::std::int64_t>> IceGrid::InternalRegistryPrx::getAdaptersAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &InternalRegistryPrx::_iceI_getAdapters, context); + return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &InternalRegistryPrx::_iceI_getAdapters, context); } ::std::function -IceGrid::InternalRegistryPrx::getAdaptersAsync(::std::function response, +IceGrid::InternalRegistryPrx::getAdaptersAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple&& _result) { response(::std::move(::std::get<0>(_result)), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::InternalRegistryPrx::_iceI_getAdapters, context); + return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::InternalRegistryPrx::_iceI_getAdapters, context); } /// \cond INTERNAL void -IceGrid::InternalRegistryPrx::_iceI_getAdapters(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const +IceGrid::InternalRegistryPrx::_iceI_getAdapters(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_InternalRegistry_getAdapters_name); outAsync->invoke(iceC_IceGrid_InternalRegistry_getAdapters_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -2495,7 +2495,7 @@ IceGrid::InternalRegistryPrx::_iceI_getAdapters(const ::std::shared_ptr<::IceInt nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2503,35 +2503,35 @@ IceGrid::InternalRegistryPrx::_iceI_getAdapters(const ::std::shared_ptr<::IceInt /// \endcond ::IceGrid::ObjectInfoSeq -IceGrid::InternalRegistryPrx::getObjects(long long int& iceP_serial, const ::Ice::Context& context) const +IceGrid::InternalRegistryPrx::getObjects(::std::int64_t& iceP_serial, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &InternalRegistryPrx::_iceI_getObjects, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &InternalRegistryPrx::_iceI_getObjects, context).get(); iceP_serial = ::std::get<1>(_result); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::IceGrid::ObjectInfoSeq, long long int>> +::std::future<::std::tuple<::IceGrid::ObjectInfoSeq, ::std::int64_t>> IceGrid::InternalRegistryPrx::getObjectsAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &InternalRegistryPrx::_iceI_getObjects, context); + return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &InternalRegistryPrx::_iceI_getObjects, context); } ::std::function -IceGrid::InternalRegistryPrx::getObjectsAsync(::std::function response, +IceGrid::InternalRegistryPrx::getObjectsAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple&& _result) { response(::std::move(::std::get<0>(_result)), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::InternalRegistryPrx::_iceI_getObjects, context); + return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceGrid::InternalRegistryPrx::_iceI_getObjects, context); } /// \cond INTERNAL void -IceGrid::InternalRegistryPrx::_iceI_getObjects(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const +IceGrid::InternalRegistryPrx::_iceI_getObjects(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_InternalRegistry_getObjects_name); outAsync->invoke(iceC_IceGrid_InternalRegistry_getObjects_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -2539,7 +2539,7 @@ IceGrid::InternalRegistryPrx::_iceI_getObjects(const ::std::shared_ptr<::IceInte nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2858,10 +2858,10 @@ IceGrid::FileReader::_iceD_getOffsetFromEnd(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_filename; - int iceP_lines; + ::std::int32_t iceP_lines; istr->readAll(iceP_filename, iceP_lines); inS.endReadParams(); - long long int ret = this->getOffsetFromEnd(::std::move(iceP_filename), iceP_lines, current); + ::std::int64_t ret = this->getOffsetFromEnd(::std::move(iceP_filename), iceP_lines, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -2876,11 +2876,11 @@ IceGrid::FileReader::_iceD_read(::IceInternal::Incoming& inS, const ::Ice::Curre _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_filename; - long long int iceP_pos; - int iceP_size; + ::std::int64_t iceP_pos; + ::std::int32_t iceP_size; istr->readAll(iceP_filename, iceP_pos, iceP_size); inS.endReadParams(); - long long int iceP_newPos; + ::std::int64_t iceP_newPos; ::Ice::StringSeq iceP_lines; bool ret = this->read(::std::move(iceP_filename), iceP_pos, iceP_size, iceP_newPos, iceP_lines, current); auto ostr = inS.startWriteParams(); @@ -3054,7 +3054,7 @@ IceGrid::Server::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::C _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_message; - int iceP_fd; + ::std::int32_t iceP_fd; istr->readAll(iceP_message, iceP_fd); inS.endReadParams(); this->writeMessage(::std::move(iceP_message), iceP_fd, current); @@ -3083,7 +3083,7 @@ IceGrid::Server::_iceD_getPid(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getPid(current); + ::std::int32_t ret = this->getPid(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -3444,7 +3444,7 @@ IceGrid::Node::_iceD_loadServer(::IceInternal::Incoming& inS, const ::Ice::Curre istr->readPendingValues(); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::std::optional& ret, const AdapterPrxDict& iceP_adapters, int iceP_actTimeout, int iceP_deactTimeout) + auto responseCB = [inA](const ::std::optional& ret, const AdapterPrxDict& iceP_adapters, ::std::int32_t iceP_actTimeout, ::std::int32_t iceP_deactTimeout) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_adapters, iceP_actTimeout, iceP_deactTimeout, ret); @@ -3468,7 +3468,7 @@ IceGrid::Node::_iceD_loadServerWithoutRestart(::IceInternal::Incoming& inS, cons istr->readPendingValues(); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::std::optional& ret, const AdapterPrxDict& iceP_adapters, int iceP_actTimeout, int iceP_deactTimeout) + auto responseCB = [inA](const ::std::optional& ret, const AdapterPrxDict& iceP_adapters, ::std::int32_t iceP_actTimeout, ::std::int32_t iceP_deactTimeout) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_adapters, iceP_actTimeout, iceP_deactTimeout, ret); @@ -3488,7 +3488,7 @@ IceGrid::Node::_iceD_destroyServer(::IceInternal::Incoming& inS, const ::Ice::Cu auto istr = inS.startReadParams(); ::std::string iceP_name; ::std::string iceP_uuid; - int iceP_revision; + ::std::int32_t iceP_revision; ::std::string iceP_replicaName; istr->readAll(iceP_name, iceP_uuid, iceP_revision, iceP_replicaName); inS.endReadParams(); @@ -3506,7 +3506,7 @@ IceGrid::Node::_iceD_destroyServerWithoutRestart(::IceInternal::Incoming& inS, c auto istr = inS.startReadParams(); ::std::string iceP_name; ::std::string iceP_uuid; - int iceP_revision; + ::std::int32_t iceP_revision; ::std::string iceP_replicaName; istr->readAll(iceP_name, iceP_uuid, iceP_revision, iceP_replicaName); inS.endReadParams(); @@ -3599,7 +3599,7 @@ IceGrid::Node::_iceD_getProcessorSocketCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getProcessorSocketCount(current); + ::std::int32_t ret = this->getProcessorSocketCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -3781,7 +3781,7 @@ IceGrid::NodeSession::_iceD_getTimeout(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getTimeout(current); + ::std::int32_t ret = this->getTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -3836,7 +3836,7 @@ IceGrid::NodeSession::_iceD_waitForApplicationUpdate(::IceInternal::Incoming& in _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_application; - int iceP_revision; + ::std::int32_t iceP_revision; istr->readAll(iceP_application, iceP_revision); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -4079,7 +4079,7 @@ IceGrid::ReplicaSession::_iceD_getTimeout(::IceInternal::Incoming& inS, const :: { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getTimeout(current); + ::std::int32_t ret = this->getTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4158,7 +4158,7 @@ IceGrid::ReplicaSession::_iceD_receivedUpdate(::IceInternal::Incoming& inS, cons _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); TopicName iceP_name; - int iceP_serial; + ::std::int32_t iceP_serial; ::std::string iceP_failure; istr->readAll(iceP_name, iceP_serial, iceP_failure); inS.endReadParams(); @@ -4362,7 +4362,7 @@ IceGrid::InternalRegistry::_iceD_getApplications(::IceInternal::Incoming& inS, c { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - long long int iceP_serial; + ::std::int64_t iceP_serial; ApplicationInfoSeq ret = this->getApplications(iceP_serial, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_serial, ret); @@ -4378,7 +4378,7 @@ IceGrid::InternalRegistry::_iceD_getAdapters(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - long long int iceP_serial; + ::std::int64_t iceP_serial; AdapterInfoSeq ret = this->getAdapters(iceP_serial, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_serial, ret); @@ -4393,7 +4393,7 @@ IceGrid::InternalRegistry::_iceD_getObjects(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - long long int iceP_serial; + ::std::int64_t iceP_serial; ObjectInfoSeq ret = this->getObjects(iceP_serial, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_serial, ret); diff --git a/slice2cpp/cpp/src/IceGrid/Internal.h b/slice2cpp/cpp/src/IceGrid/Internal.h index 186b0b0adeee..1c816ed454d5 100644 --- a/slice2cpp/cpp/src/IceGrid/Internal.h +++ b/slice2cpp/cpp/src/IceGrid/Internal.h @@ -108,7 +108,7 @@ enum class TopicName : unsigned char ObjectObserver }; -using StringLongDict = ::std::map<::std::string, long long int>; +using StringLongDict = ::std::map<::std::string, ::std::int64_t>; } @@ -281,14 +281,14 @@ class FileReaderPrx : public ::Ice::Proxy * Count the number of given lines from the end of the file and return the file offset. * @param context The Context map to send with the invocation. */ - long long int getOffsetFromEnd(const ::std::string& filename, int lines, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t getOffsetFromEnd(const ::std::string& filename, ::std::int32_t lines, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Count the number of given lines from the end of the file and return the file offset. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getOffsetFromEndAsync(const ::std::string& filename, int lines, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> getOffsetFromEndAsync(const ::std::string& filename, ::std::int32_t lines, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Count the number of given lines from the end of the file and return the file offset. @@ -299,28 +299,28 @@ class FileReaderPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getOffsetFromEndAsync(const ::std::string& filename, int lines, - ::std::function response, + getOffsetFromEndAsync(const ::std::string& filename, ::std::int32_t lines, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getOffsetFromEnd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_getOffsetFromEnd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** * Read lines (or size bytes) at the specified position from the given file. * @param context The Context map to send with the invocation. */ - bool read(const ::std::string& filename, long long int pos, int size, long long int& newPos, ::Ice::StringSeq& lines, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool read(const ::std::string& filename, ::std::int64_t pos, ::std::int32_t size, ::std::int64_t& newPos, ::Ice::StringSeq& lines, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Read lines (or size bytes) at the specified position from the given file. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future<::std::tuple> readAsync(const ::std::string& filename, long long int pos, int size, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> readAsync(const ::std::string& filename, ::std::int64_t pos, ::std::int32_t size, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Read lines (or size bytes) at the specified position from the given file. @@ -331,14 +331,14 @@ class FileReaderPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - readAsync(const ::std::string& filename, long long int pos, int size, - ::std::function response, + readAsync(const ::std::string& filename, ::std::int64_t pos, ::std::int32_t size, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::string&, long long int, int, const ::Ice::Context&) const; + void _iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::string&, ::std::int64_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -591,14 +591,14 @@ class ServerPrx : public ::Ice::Proxy * Write message on servers' stdout or stderr. * @param context The Context map to send with the invocation. */ - void writeMessage(const ::std::string& message, int fd, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void writeMessage(const ::std::string& message, ::std::int32_t fd, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Write message on servers' stdout or stderr. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future writeMessageAsync(const ::std::string& message, int fd, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future writeMessageAsync(const ::std::string& message, ::std::int32_t fd, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Write message on servers' stdout or stderr. @@ -609,14 +609,14 @@ class ServerPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - writeMessageAsync(const ::std::string& message, int fd, + writeMessageAsync(const ::std::string& message, ::std::int32_t fd, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -659,7 +659,7 @@ class ServerPrx : public ::Ice::Proxy * it's the pid value returned by the fork() system call and converted to an integer. * @param context The Context map to send with the invocation. */ - int getPid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getPid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Get the server pid. Note that the value returned by this method is system dependant. On Unix operating systems, @@ -667,7 +667,7 @@ class ServerPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getPidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getPidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the server pid. Note that the value returned by this method is system dependant. On Unix operating systems, @@ -679,13 +679,13 @@ class ServerPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getPidAsync(::std::function response, + getPidAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -1049,7 +1049,7 @@ class NodePrx : public ::Ice::Proxy * property files, etc), they will be created. * @param context The Context map to send with the invocation. */ - ::std::optional loadServer(const ::std::shared_ptr& svr, const ::std::string& replicaName, AdapterPrxDict& adapters, int& actTimeout, int& deactTimeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional loadServer(const ::std::shared_ptr& svr, const ::std::string& replicaName, AdapterPrxDict& adapters, ::std::int32_t& actTimeout, ::std::int32_t& deactTimeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Load the given server. If the server resources weren't already created (database environment directories, @@ -1057,7 +1057,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future<::std::tuple<::std::optional, AdapterPrxDict, int, int>> loadServerAsync(const ::std::shared_ptr& svr, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>> loadServerAsync(const ::std::shared_ptr& svr, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Load the given server. If the server resources weren't already created (database environment directories, @@ -1070,13 +1070,13 @@ class NodePrx : public ::Ice::Proxy */ ::std::function loadServerAsync(const ::std::shared_ptr& svr, const ::std::string& replicaName, - ::std::function, ::IceGrid::AdapterPrxDict, int, int)> response, + ::std::function, ::IceGrid::AdapterPrxDict, ::std::int32_t, ::std::int32_t)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_loadServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, int, int>>>&, const ::std::shared_ptr&, const ::std::string&, const ::Ice::Context&) const; + void _iceI_loadServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>>&, const ::std::shared_ptr&, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -1085,7 +1085,7 @@ class NodePrx : public ::Ice::Proxy * without a restart, a DeploymentException is raised. * @param context The Context map to send with the invocation. */ - ::std::optional loadServerWithoutRestart(const ::std::shared_ptr& svr, const ::std::string& replicaName, AdapterPrxDict& adapters, int& actTimeout, int& deactTimeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional loadServerWithoutRestart(const ::std::shared_ptr& svr, const ::std::string& replicaName, AdapterPrxDict& adapters, ::std::int32_t& actTimeout, ::std::int32_t& deactTimeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Load the given server and ensure the server won't be restarted. If the server resources weren't already created @@ -1094,7 +1094,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future<::std::tuple<::std::optional, AdapterPrxDict, int, int>> loadServerWithoutRestartAsync(const ::std::shared_ptr& svr, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>> loadServerWithoutRestartAsync(const ::std::shared_ptr& svr, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Load the given server and ensure the server won't be restarted. If the server resources weren't already created @@ -1108,27 +1108,27 @@ class NodePrx : public ::Ice::Proxy */ ::std::function loadServerWithoutRestartAsync(const ::std::shared_ptr& svr, const ::std::string& replicaName, - ::std::function, ::IceGrid::AdapterPrxDict, int, int)> response, + ::std::function, ::IceGrid::AdapterPrxDict, ::std::int32_t, ::std::int32_t)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_loadServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, int, int>>>&, const ::std::shared_ptr&, const ::std::string&, const ::Ice::Context&) const; + void _iceI_loadServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::optional, AdapterPrxDict, ::std::int32_t, ::std::int32_t>>>&, const ::std::shared_ptr&, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** * Destroy the given server. * @param context The Context map to send with the invocation. */ - void destroyServer(const ::std::string& name, const ::std::string& uuid, int revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void destroyServer(const ::std::string& name, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Destroy the given server. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future destroyServerAsync(const ::std::string& name, const ::std::string& uuid, int revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future destroyServerAsync(const ::std::string& name, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Destroy the given server. @@ -1139,28 +1139,28 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - destroyServerAsync(const ::std::string& name, const ::std::string& uuid, int revision, const ::std::string& replicaName, + destroyServerAsync(const ::std::string& name, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& replicaName, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_destroyServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, int, const ::std::string&, const ::Ice::Context&) const; + void _iceI_destroyServer(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, ::std::int32_t, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** * Destroy the server if it's not active. * @param context The Context map to send with the invocation. */ - void destroyServerWithoutRestart(const ::std::string& name, const ::std::string& uuid, int revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void destroyServerWithoutRestart(const ::std::string& name, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Destroy the server if it's not active. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future destroyServerWithoutRestartAsync(const ::std::string& name, const ::std::string& uuid, int revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future destroyServerWithoutRestartAsync(const ::std::string& name, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& replicaName, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Destroy the server if it's not active. @@ -1171,14 +1171,14 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - destroyServerWithoutRestartAsync(const ::std::string& name, const ::std::string& uuid, int revision, const ::std::string& replicaName, + destroyServerWithoutRestartAsync(const ::std::string& name, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& replicaName, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_destroyServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, int, const ::std::string&, const ::Ice::Context&) const; + void _iceI_destroyServerWithoutRestart(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, ::std::int32_t, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -1351,14 +1351,14 @@ class NodePrx : public ::Ice::Proxy * Get the number of processor sockets for the machine where this node is running. * @param context The Context map to send with the invocation. */ - int getProcessorSocketCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getProcessorSocketCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Get the number of processor sockets for the machine where this node is running. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getProcessorSocketCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getProcessorSocketCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the number of processor sockets for the machine where this node is running. @@ -1369,13 +1369,13 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getProcessorSocketCountAsync(::std::function response, + getProcessorSocketCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -1541,14 +1541,14 @@ class NodeSessionPrx : public ::Ice::Proxy * Return the node session timeout. * @param context The Context map to send with the invocation. */ - int getTimeout(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getTimeout(const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Return the node session timeout. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Return the node session timeout. @@ -1559,13 +1559,13 @@ class NodeSessionPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getTimeoutAsync(::std::function response, + getTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -1667,7 +1667,7 @@ class NodeSessionPrx : public ::Ice::Proxy * replicas have the up-to-date descriptor of the server. * @param context The Context map to send with the invocation. */ - void waitForApplicationUpdate(const ::std::string& application, int revision, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForApplicationUpdate(const ::std::string& application, ::std::int32_t revision, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Wait for the application update to complete (the application is completely updated once all the registry @@ -1676,7 +1676,7 @@ class NodeSessionPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future waitForApplicationUpdateAsync(const ::std::string& application, int revision, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForApplicationUpdateAsync(const ::std::string& application, ::std::int32_t revision, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Wait for the application update to complete (the application is completely updated once all the registry @@ -1689,14 +1689,14 @@ class NodeSessionPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - waitForApplicationUpdateAsync(const ::std::string& application, int revision, + waitForApplicationUpdateAsync(const ::std::string& application, ::std::int32_t revision, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForApplicationUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_waitForApplicationUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -1878,14 +1878,14 @@ class ReplicaSessionPrx : public ::Ice::Proxy getTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Return the replica session timeout. @@ -1896,13 +1896,13 @@ class ReplicaSessionPrx : public ::Ice::Proxy - getTimeoutAsync(::std::function response, + getTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -2044,7 +2044,7 @@ class ReplicaSessionPrx : public ::Ice::Proxy receivedUpdateAsync(TopicName name, int serial, const ::std::string& failure, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future receivedUpdateAsync(TopicName name, ::std::int32_t serial, const ::std::string& failure, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Notify the master that an update was received. The master might wait for replication updates to be received by @@ -2064,14 +2064,14 @@ class ReplicaSessionPrx : public ::Ice::Proxy - receivedUpdateAsync(TopicName name, int serial, const ::std::string& failure, + receivedUpdateAsync(TopicName name, ::std::int32_t serial, const ::std::string& failure, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_receivedUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, TopicName, int, const ::std::string&, const ::Ice::Context&) const; + void _iceI_receivedUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, TopicName, ::std::int32_t, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -2347,14 +2347,14 @@ class InternalRegistryPrx : public ::Ice::Proxy> getApplicationsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> getApplicationsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Return applications, adapters, objects from this replica. @@ -2365,41 +2365,41 @@ class InternalRegistryPrx : public ::Ice::Proxy - getApplicationsAsync(::std::function response, + getApplicationsAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getApplications(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; + void _iceI_getApplications(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; /// \endcond - AdapterInfoSeq getAdapters(long long int& serial, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + AdapterInfoSeq getAdapters(::std::int64_t& serial, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> getAdaptersAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> getAdaptersAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getAdaptersAsync(::std::function response, + getAdaptersAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getAdapters(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; + void _iceI_getAdapters(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; /// \endcond - ObjectInfoSeq getObjects(long long int& serial, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ObjectInfoSeq getObjects(::std::int64_t& serial, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> getObjectsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> getObjectsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getObjectsAsync(::std::function response, + getObjectsAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getObjects(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; + void _iceI_getObjects(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; /// \endcond /** @@ -2682,7 +2682,7 @@ class InternalServerDescriptor : public ::Ice::ValueHelper& distrib, bool processRegistered, const ::Ice::StringSeq& options, const ::Ice::StringSeq& envs, const ::Ice::StringSeq& logs, const ::IceGrid::InternalAdapterDescriptorSeq& adapters, const ::IceGrid::InternalDbEnvDescriptorSeq& dbEnvs, const ::IceGrid::PropertyDescriptorSeqDict& properties, const std::optional<::Ice::StringSeq>& services) : + InternalServerDescriptor(const ::std::string& id, const ::std::string& application, const ::std::string& uuid, ::std::int32_t revision, const ::std::string& sessionId, const ::std::string& exe, const ::std::string& pwd, const ::std::string& user, const ::std::string& activation, const ::std::string& activationTimeout, const ::std::string& deactivationTimeout, bool applicationDistrib, const ::std::shared_ptr<::IceGrid::InternalDistributionDescriptor>& distrib, bool processRegistered, const ::Ice::StringSeq& options, const ::Ice::StringSeq& envs, const ::Ice::StringSeq& logs, const ::IceGrid::InternalAdapterDescriptorSeq& adapters, const ::IceGrid::InternalDbEnvDescriptorSeq& dbEnvs, const ::IceGrid::PropertyDescriptorSeqDict& properties, const std::optional<::Ice::StringSeq>& services) : id(id), application(application), uuid(uuid), @@ -2711,7 +2711,7 @@ class InternalServerDescriptor : public ::Ice::ValueHelper&, const bool&, const ::Ice::StringSeq&, const ::Ice::StringSeq&, const ::Ice::StringSeq&, const ::IceGrid::InternalAdapterDescriptorSeq&, const ::IceGrid::InternalDbEnvDescriptorSeq&, const ::IceGrid::PropertyDescriptorSeqDict&, const std::optional<::Ice::StringSeq>&> ice_tuple() const + std::tuple&, const bool&, const ::Ice::StringSeq&, const ::Ice::StringSeq&, const ::Ice::StringSeq&, const ::IceGrid::InternalAdapterDescriptorSeq&, const ::IceGrid::InternalDbEnvDescriptorSeq&, const ::IceGrid::PropertyDescriptorSeqDict&, const std::optional<::Ice::StringSeq>&> ice_tuple() const { return std::tie(id, application, uuid, revision, sessionId, exe, pwd, user, activation, activationTimeout, deactivationTimeout, applicationDistrib, distrib, processRegistered, options, envs, logs, adapters, dbEnvs, properties, services); } @@ -2737,7 +2737,7 @@ class InternalServerDescriptor : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(name, os, hostname, release, version, machine, nProcessors, dataDir); } @@ -2886,7 +2886,7 @@ class InternalNodeInfo : public ::Ice::ValueHelper returnValue; AdapterPrxDict adapters; - int actTimeout; - int deactTimeout; + ::std::int32_t actTimeout; + ::std::int32_t deactTimeout; }; /** @@ -3583,7 +3583,7 @@ class Node : public virtual FileReader, * @param exception The exception callback. * @param current The Current object for the invocation. */ - virtual void loadServerAsync(::std::shared_ptr svr, ::std::string replicaName, ::std::function& returnValue, const AdapterPrxDict& adapters, int actTimeout, int deactTimeout)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void loadServerAsync(::std::shared_ptr svr, ::std::string replicaName, ::std::function& returnValue, const AdapterPrxDict& adapters, ::std::int32_t actTimeout, ::std::int32_t deactTimeout)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_loadServer(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -3595,8 +3595,8 @@ class Node : public virtual FileReader, { ::std::optional returnValue; AdapterPrxDict adapters; - int actTimeout; - int deactTimeout; + ::std::int32_t actTimeout; + ::std::int32_t deactTimeout; }; /** @@ -3607,7 +3607,7 @@ class Node : public virtual FileReader, * @param exception The exception callback. * @param current The Current object for the invocation. */ - virtual void loadServerWithoutRestartAsync(::std::shared_ptr svr, ::std::string replicaName, ::std::function& returnValue, const AdapterPrxDict& adapters, int actTimeout, int deactTimeout)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void loadServerWithoutRestartAsync(::std::shared_ptr svr, ::std::string replicaName, ::std::function& returnValue, const AdapterPrxDict& adapters, ::std::int32_t actTimeout, ::std::int32_t deactTimeout)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_loadServerWithoutRestart(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -3618,7 +3618,7 @@ class Node : public virtual FileReader, * @param exception The exception callback. * @param current The Current object for the invocation. */ - virtual void destroyServerAsync(::std::string name, ::std::string uuid, int revision, ::std::string replicaName, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void destroyServerAsync(::std::string name, ::std::string uuid, ::std::int32_t revision, ::std::string replicaName, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_destroyServer(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -3629,7 +3629,7 @@ class Node : public virtual FileReader, * @param exception The exception callback. * @param current The Current object for the invocation. */ - virtual void destroyServerWithoutRestartAsync(::std::string name, ::std::string uuid, int revision, ::std::string replicaName, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void destroyServerWithoutRestartAsync(::std::string name, ::std::string uuid, ::std::int32_t revision, ::std::string replicaName, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_destroyServerWithoutRestart(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -3688,7 +3688,7 @@ class Node : public virtual FileReader, * Get the number of processor sockets for the machine where this node is running. * @param current The Current object for the invocation. */ - virtual int getProcessorSocketCount(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getProcessorSocketCount(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getProcessorSocketCount(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -3764,7 +3764,7 @@ class NodeSession : public virtual ::Ice::Object * Return the node session timeout. * @param current The Current object for the invocation. */ - virtual int getTimeout(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getTimeout(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getTimeout(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -3806,7 +3806,7 @@ class NodeSession : public virtual ::Ice::Object * @param exception The exception callback. * @param current The Current object for the invocation. */ - virtual void waitForApplicationUpdateAsync(::std::string application, int revision, ::std::function response, ::std::function exception, const ::Ice::Current& current) const = 0; + virtual void waitForApplicationUpdateAsync(::std::string application, ::std::int32_t revision, ::std::function response, ::std::function exception, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_waitForApplicationUpdate(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -3913,7 +3913,7 @@ class ReplicaSession : public virtual ::Ice::Object * Return the replica session timeout. * @param current The Current object for the invocation. */ - virtual int getTimeout(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getTimeout(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getTimeout(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -3961,7 +3961,7 @@ class ReplicaSession : public virtual ::Ice::Object * all the replicas before to continue. * @param current The Current object for the invocation. */ - virtual void receivedUpdate(TopicName name, int serial, ::std::string failure, const ::Ice::Current& current) = 0; + virtual void receivedUpdate(TopicName name, ::std::int32_t serial, ::std::string failure, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_receivedUpdate(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -4077,14 +4077,14 @@ class InternalRegistry : public virtual FileReader struct GetApplicationsResult { ApplicationInfoSeq returnValue; - long long int serial; + ::std::int64_t serial; }; /** * Return applications, adapters, objects from this replica. * @param current The Current object for the invocation. */ - virtual ApplicationInfoSeq getApplications(long long int& serial, const ::Ice::Current& current) const = 0; + virtual ApplicationInfoSeq getApplications(::std::int64_t& serial, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getApplications(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -4095,10 +4095,10 @@ class InternalRegistry : public virtual FileReader struct GetAdaptersResult { AdapterInfoSeq returnValue; - long long int serial; + ::std::int64_t serial; }; - virtual AdapterInfoSeq getAdapters(long long int& serial, const ::Ice::Current& current) const = 0; + virtual AdapterInfoSeq getAdapters(::std::int64_t& serial, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getAdapters(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -4109,10 +4109,10 @@ class InternalRegistry : public virtual FileReader struct GetObjectsResult { ObjectInfoSeq returnValue; - long long int serial; + ::std::int64_t serial; }; - virtual ObjectInfoSeq getObjects(long long int& serial, const ::Ice::Current& current) const = 0; + virtual ObjectInfoSeq getObjects(::std::int64_t& serial, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getObjects(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/cpp/src/IceStorm/Election.cpp b/slice2cpp/cpp/src/IceStorm/Election.cpp index c5f0c41ae724..73c243646771 100644 --- a/slice2cpp/cpp/src/IceStorm/Election.cpp +++ b/slice2cpp/cpp/src/IceStorm/Election.cpp @@ -408,19 +408,19 @@ IceStormElection::TopicManagerSyncPrx::ice_staticId() } void -IceStormElection::NodePrx::invitation(int iceP_j, const ::std::string& iceP_gn, const ::Ice::Context& context) const +IceStormElection::NodePrx::invitation(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &NodePrx::_iceI_invitation, iceP_j, iceP_gn, context).get(); } ::std::future -IceStormElection::NodePrx::invitationAsync(int iceP_j, const ::std::string& iceP_gn, const ::Ice::Context& context) const +IceStormElection::NodePrx::invitationAsync(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodePrx::_iceI_invitation, iceP_j, iceP_gn, context); } ::std::function -IceStormElection::NodePrx::invitationAsync(int iceP_j, const ::std::string& iceP_gn, +IceStormElection::NodePrx::invitationAsync(::std::int32_t iceP_j, const ::std::string& iceP_gn, ::std::function response, ::std::function ex, ::std::function sent, @@ -431,7 +431,7 @@ IceStormElection::NodePrx::invitationAsync(int iceP_j, const ::std::string& iceP /// \cond INTERNAL void -IceStormElection::NodePrx::_iceI_invitation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_j, const ::std::string& iceP_gn, const ::Ice::Context& context) const +IceStormElection::NodePrx::_iceI_invitation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceStormElection_Node_invitation_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -443,19 +443,19 @@ IceStormElection::NodePrx::_iceI_invitation(const ::std::shared_ptr<::IceInterna /// \endcond void -IceStormElection::NodePrx::ready(int iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, int iceP_max, long long int iceP_generation, const ::Ice::Context& context) const +IceStormElection::NodePrx::ready(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, ::std::int32_t iceP_max, ::std::int64_t iceP_generation, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &NodePrx::_iceI_ready, iceP_j, iceP_gn, iceP_coordinator, iceP_max, iceP_generation, context).get(); } ::std::future -IceStormElection::NodePrx::readyAsync(int iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, int iceP_max, long long int iceP_generation, const ::Ice::Context& context) const +IceStormElection::NodePrx::readyAsync(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, ::std::int32_t iceP_max, ::std::int64_t iceP_generation, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodePrx::_iceI_ready, iceP_j, iceP_gn, iceP_coordinator, iceP_max, iceP_generation, context); } ::std::function -IceStormElection::NodePrx::readyAsync(int iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, int iceP_max, long long int iceP_generation, +IceStormElection::NodePrx::readyAsync(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, ::std::int32_t iceP_max, ::std::int64_t iceP_generation, ::std::function response, ::std::function ex, ::std::function sent, @@ -466,7 +466,7 @@ IceStormElection::NodePrx::readyAsync(int iceP_j, const ::std::string& iceP_gn, /// \cond INTERNAL void -IceStormElection::NodePrx::_iceI_ready(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, int iceP_max, long long int iceP_generation, const ::Ice::Context& context) const +IceStormElection::NodePrx::_iceI_ready(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::std::optional<::Ice::ObjectPrx>& iceP_coordinator, ::std::int32_t iceP_max, ::std::int64_t iceP_generation, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceStormElection_Node_ready_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -478,19 +478,19 @@ IceStormElection::NodePrx::_iceI_ready(const ::std::shared_ptr<::IceInternal::Ou /// \endcond void -IceStormElection::NodePrx::accept(int iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, int iceP_max, const ::Ice::Context& context) const +IceStormElection::NodePrx::accept(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, ::std::int32_t iceP_max, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &NodePrx::_iceI_accept, iceP_j, iceP_gn, iceP_forwardedInvites, iceP_observer, iceP_llu, iceP_max, context).get(); } ::std::future -IceStormElection::NodePrx::acceptAsync(int iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, int iceP_max, const ::Ice::Context& context) const +IceStormElection::NodePrx::acceptAsync(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, ::std::int32_t iceP_max, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodePrx::_iceI_accept, iceP_j, iceP_gn, iceP_forwardedInvites, iceP_observer, iceP_llu, iceP_max, context); } ::std::function -IceStormElection::NodePrx::acceptAsync(int iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, int iceP_max, +IceStormElection::NodePrx::acceptAsync(::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, ::std::int32_t iceP_max, ::std::function response, ::std::function ex, ::std::function sent, @@ -501,7 +501,7 @@ IceStormElection::NodePrx::acceptAsync(int iceP_j, const ::std::string& iceP_gn, /// \cond INTERNAL void -IceStormElection::NodePrx::_iceI_accept(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, int iceP_max, const ::Ice::Context& context) const +IceStormElection::NodePrx::_iceI_accept(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_j, const ::std::string& iceP_gn, const ::Ice::IntSeq& iceP_forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& iceP_observer, const LogUpdate& iceP_llu, ::std::int32_t iceP_max, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceStormElection_Node_accept_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -545,19 +545,19 @@ IceStormElection::NodePrx::_iceI_areYouCoordinator(const ::std::shared_ptr<::Ice /// \endcond bool -IceStormElection::NodePrx::areYouThere(const ::std::string& iceP_gn, int iceP_j, const ::Ice::Context& context) const +IceStormElection::NodePrx::areYouThere(const ::std::string& iceP_gn, ::std::int32_t iceP_j, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &NodePrx::_iceI_areYouThere, iceP_gn, iceP_j, context).get(); } ::std::future -IceStormElection::NodePrx::areYouThereAsync(const ::std::string& iceP_gn, int iceP_j, const ::Ice::Context& context) const +IceStormElection::NodePrx::areYouThereAsync(const ::std::string& iceP_gn, ::std::int32_t iceP_j, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &NodePrx::_iceI_areYouThere, iceP_gn, iceP_j, context); } ::std::function -IceStormElection::NodePrx::areYouThereAsync(const ::std::string& iceP_gn, int iceP_j, +IceStormElection::NodePrx::areYouThereAsync(const ::std::string& iceP_gn, ::std::int32_t iceP_j, ::std::function response, ::std::function ex, ::std::function sent, @@ -568,7 +568,7 @@ IceStormElection::NodePrx::areYouThereAsync(const ::std::string& iceP_gn, int ic /// \cond INTERNAL void -IceStormElection::NodePrx::_iceI_areYouThere(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_gn, int iceP_j, const ::Ice::Context& context) const +IceStormElection::NodePrx::_iceI_areYouThere(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_gn, ::std::int32_t iceP_j, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceStormElection_Node_areYouThere_name); outAsync->invoke(iceC_IceStormElection_Node_areYouThere_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -970,7 +970,7 @@ IceStormElection::Node::_iceD_invitation(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_j; + ::std::int32_t iceP_j; ::std::string iceP_gn; istr->readAll(iceP_j, iceP_gn); inS.endReadParams(); @@ -986,11 +986,11 @@ IceStormElection::Node::_iceD_ready(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_j; + ::std::int32_t iceP_j; ::std::string iceP_gn; ::std::optional<::Ice::ObjectPrx> iceP_coordinator; - int iceP_max; - long long int iceP_generation; + ::std::int32_t iceP_max; + ::std::int64_t iceP_generation; istr->readAll(iceP_j, iceP_gn, iceP_coordinator, iceP_max, iceP_generation); inS.endReadParams(); this->ready(iceP_j, ::std::move(iceP_gn), ::std::move(iceP_coordinator), iceP_max, iceP_generation, current); @@ -1005,12 +1005,12 @@ IceStormElection::Node::_iceD_accept(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_j; + ::std::int32_t iceP_j; ::std::string iceP_gn; ::Ice::IntSeq iceP_forwardedInvites; ::std::optional<::Ice::ObjectPrx> iceP_observer; LogUpdate iceP_llu; - int iceP_max; + ::std::int32_t iceP_max; istr->readAll(iceP_j, iceP_gn, iceP_forwardedInvites, iceP_observer, iceP_llu, iceP_max); inS.endReadParams(); this->accept(iceP_j, ::std::move(iceP_gn), ::std::move(iceP_forwardedInvites), ::std::move(iceP_observer), ::std::move(iceP_llu), iceP_max, current); @@ -1040,7 +1040,7 @@ IceStormElection::Node::_iceD_areYouThere(::IceInternal::Incoming& inS, const :: _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_gn; - int iceP_j; + ::std::int32_t iceP_j; istr->readAll(iceP_gn, iceP_j); inS.endReadParams(); bool ret = this->areYouThere(::std::move(iceP_gn), iceP_j, current); diff --git a/slice2cpp/cpp/src/IceStorm/Election.h b/slice2cpp/cpp/src/IceStorm/Election.h index 7b89599cdf48..9d0fce0c3211 100644 --- a/slice2cpp/cpp/src/IceStorm/Election.h +++ b/slice2cpp/cpp/src/IceStorm/Election.h @@ -456,7 +456,7 @@ class NodePrx : public ::Ice::Proxy * @param gn The group name. * @param context The Context map to send with the invocation. */ - void invitation(int j, const ::std::string& gn, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void invitation(::std::int32_t j, const ::std::string& gn, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Invite the node into a group with the given coordinator and group name. @@ -465,7 +465,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future invitationAsync(int j, const ::std::string& gn, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future invitationAsync(::std::int32_t j, const ::std::string& gn, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Invite the node into a group with the given coordinator and group name. @@ -478,14 +478,14 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - invitationAsync(int j, const ::std::string& gn, + invitationAsync(::std::int32_t j, const ::std::string& gn, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_invitation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::std::string&, const ::Ice::Context&) const; + void _iceI_invitation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -497,7 +497,7 @@ class NodePrx : public ::Ice::Proxy * @param generation The current generation count. * @param context The Context map to send with the invocation. */ - void ready(int j, const ::std::string& gn, const ::std::optional<::Ice::ObjectPrx>& coordinator, int max, long long int generation, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void ready(::std::int32_t j, const ::std::string& gn, const ::std::optional<::Ice::ObjectPrx>& coordinator, ::std::int32_t max, ::std::int64_t generation, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Call from the group coordinator to a node to inform the node that the replica group is active. @@ -509,7 +509,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future readyAsync(int j, const ::std::string& gn, const ::std::optional<::Ice::ObjectPrx>& coordinator, int max, long long int generation, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future readyAsync(::std::int32_t j, const ::std::string& gn, const ::std::optional<::Ice::ObjectPrx>& coordinator, ::std::int32_t max, ::std::int64_t generation, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Call from the group coordinator to a node to inform the node that the replica group is active. @@ -525,14 +525,14 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - readyAsync(int j, const ::std::string& gn, const ::std::optional<::Ice::ObjectPrx>& coordinator, int max, long long int generation, + readyAsync(::std::int32_t j, const ::std::string& gn, const ::std::optional<::Ice::ObjectPrx>& coordinator, ::std::int32_t max, ::std::int64_t generation, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_ready(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::std::string&, const ::std::optional<::Ice::ObjectPrx>&, int, long long int, const ::Ice::Context&) const; + void _iceI_ready(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::std::string&, const ::std::optional<::Ice::ObjectPrx>&, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond /** @@ -545,7 +545,7 @@ class NodePrx : public ::Ice::Proxy * @param max The highest priority node seen by this replica group. * @param context The Context map to send with the invocation. */ - void accept(int j, const ::std::string& gn, const ::Ice::IntSeq& forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& observer, const LogUpdate& llu, int max, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void accept(::std::int32_t j, const ::std::string& gn, const ::Ice::IntSeq& forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& observer, const LogUpdate& llu, ::std::int32_t max, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Called to accept an invitation into the given group. @@ -558,7 +558,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future acceptAsync(int j, const ::std::string& gn, const ::Ice::IntSeq& forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& observer, const LogUpdate& llu, int max, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future acceptAsync(::std::int32_t j, const ::std::string& gn, const ::Ice::IntSeq& forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& observer, const LogUpdate& llu, ::std::int32_t max, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Called to accept an invitation into the given group. @@ -575,14 +575,14 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - acceptAsync(int j, const ::std::string& gn, const ::Ice::IntSeq& forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& observer, const LogUpdate& llu, int max, + acceptAsync(::std::int32_t j, const ::std::string& gn, const ::Ice::IntSeq& forwardedInvites, const ::std::optional<::Ice::ObjectPrx>& observer, const LogUpdate& llu, ::std::int32_t max, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_accept(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::std::string&, const ::Ice::IntSeq&, const ::std::optional<::Ice::ObjectPrx>&, const LogUpdate&, int, const ::Ice::Context&) const; + void _iceI_accept(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::std::string&, const ::Ice::IntSeq&, const ::std::optional<::Ice::ObjectPrx>&, const LogUpdate&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -624,7 +624,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return True if the node is a member, false otherwise. */ - bool areYouThere(const ::std::string& gn, int j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool areYouThere(const ::std::string& gn, ::std::int32_t j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Determine if the node is a member of the given group with the given coordinator. @@ -633,7 +633,7 @@ class NodePrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future areYouThereAsync(const ::std::string& gn, int j, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future areYouThereAsync(const ::std::string& gn, ::std::int32_t j, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Determine if the node is a member of the given group with the given coordinator. @@ -646,14 +646,14 @@ class NodePrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - areYouThereAsync(const ::std::string& gn, int j, + areYouThereAsync(const ::std::string& gn, ::std::int32_t j, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_areYouThere(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_areYouThere(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -837,7 +837,7 @@ struct NodeInfo /** * The identity of the node. */ - int id; + ::std::int32_t id; /** * The node proxy. */ @@ -847,7 +847,7 @@ struct NodeInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(id, n); } @@ -861,7 +861,7 @@ struct GroupInfo /** * The identity of the node. */ - int id; + ::std::int32_t id; /** * The last known log update for this node. */ @@ -871,7 +871,7 @@ struct GroupInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, llu); } @@ -882,11 +882,11 @@ struct QueryInfo /** * The node id. */ - int id; + ::std::int32_t id; /** * The nodes coordinator. */ - int coord; + ::std::int32_t coord; /** * The nodes group name. */ @@ -906,13 +906,13 @@ struct QueryInfo /** * The highest priority node that this node has seen. */ - int max; + ::std::int32_t max; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::IceStormElection::NodeState&, const ::IceStormElection::GroupInfoSeq&, const int&> ice_tuple() const + std::tuple&, const ::IceStormElection::NodeState&, const ::IceStormElection::GroupInfoSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(id, coord, group, replica, state, up, max); } @@ -1196,7 +1196,7 @@ class Node : public virtual ::Ice::Object * @param gn The group name. * @param current The Current object for the invocation. */ - virtual void invitation(int j, ::std::string gn, const ::Ice::Current& current) = 0; + virtual void invitation(::std::int32_t j, ::std::string gn, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_invitation(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1210,7 +1210,7 @@ class Node : public virtual ::Ice::Object * @param generation The current generation count. * @param current The Current object for the invocation. */ - virtual void ready(int j, ::std::string gn, ::std::optional<::Ice::ObjectPrx> coordinator, int max, long long int generation, const ::Ice::Current& current) = 0; + virtual void ready(::std::int32_t j, ::std::string gn, ::std::optional<::Ice::ObjectPrx> coordinator, ::std::int32_t max, ::std::int64_t generation, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_ready(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1225,7 +1225,7 @@ class Node : public virtual ::Ice::Object * @param max The highest priority node seen by this replica group. * @param current The Current object for the invocation. */ - virtual void accept(int j, ::std::string gn, ::Ice::IntSeq forwardedInvites, ::std::optional<::Ice::ObjectPrx> observer, LogUpdate llu, int max, const ::Ice::Current& current) = 0; + virtual void accept(::std::int32_t j, ::std::string gn, ::Ice::IntSeq forwardedInvites, ::std::optional<::Ice::ObjectPrx> observer, LogUpdate llu, ::std::int32_t max, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_accept(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1247,7 +1247,7 @@ class Node : public virtual ::Ice::Object * @param current The Current object for the invocation. * @return True if the node is a member, false otherwise. */ - virtual bool areYouThere(::std::string gn, int j, const ::Ice::Current& current) const = 0; + virtual bool areYouThere(::std::string gn, ::std::int32_t j, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_areYouThere(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/cpp/src/IceStorm/LLURecord.h b/slice2cpp/cpp/src/IceStorm/LLURecord.h index 02a41f5818ef..bf07e3391542 100644 --- a/slice2cpp/cpp/src/IceStorm/LLURecord.h +++ b/slice2cpp/cpp/src/IceStorm/LLURecord.h @@ -49,17 +49,17 @@ struct LogUpdate /** * The generation. */ - long long int generation; + ::std::int64_t generation; /** * The iteration within this generation. */ - long long int iteration; + ::std::int64_t iteration; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(generation, iteration); } diff --git a/slice2cpp/cpp/src/IceStorm/LinkRecord.h b/slice2cpp/cpp/src/IceStorm/LinkRecord.h index b0e816406656..1ea4b481d98d 100644 --- a/slice2cpp/cpp/src/IceStorm/LinkRecord.h +++ b/slice2cpp/cpp/src/IceStorm/LinkRecord.h @@ -55,7 +55,7 @@ struct LinkRecord /** * The cost. */ - int cost; + ::std::int32_t cost; /** * The linked topic for getLinkInfoSeq */ @@ -65,7 +65,7 @@ struct LinkRecord * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const int&, const ::std::optional<::IceStorm::TopicPrx>&> ice_tuple() const + std::tuple&, const ::std::int32_t&, const ::std::optional<::IceStorm::TopicPrx>&> ice_tuple() const { return std::tie(obj, cost, theTopic); } diff --git a/slice2cpp/cpp/src/IceStorm/SubscriberRecord.h b/slice2cpp/cpp/src/IceStorm/SubscriberRecord.h index 42a0f2cdbd21..25bfadac1d78 100644 --- a/slice2cpp/cpp/src/IceStorm/SubscriberRecord.h +++ b/slice2cpp/cpp/src/IceStorm/SubscriberRecord.h @@ -100,7 +100,7 @@ struct SubscriberRecord /** * The cost. */ - int cost; + ::std::int32_t cost; /** * The linked topic. */ @@ -110,7 +110,7 @@ struct SubscriberRecord * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::IceStorm::QoS&, const int&, const ::std::optional<::IceStorm::TopicPrx>&> ice_tuple() const + std::tuple&, const ::IceStorm::QoS&, const ::std::int32_t&, const ::std::optional<::IceStorm::TopicPrx>&> ice_tuple() const { return std::tie(topicName, id, link, obj, theQoS, cost, theTopic); } diff --git a/slice2cpp/cpp/src/icegriddb/DBTypes.h b/slice2cpp/cpp/src/icegriddb/DBTypes.h index 521ba48c258d..fbad8df361c3 100644 --- a/slice2cpp/cpp/src/icegriddb/DBTypes.h +++ b/slice2cpp/cpp/src/icegriddb/DBTypes.h @@ -37,7 +37,7 @@ struct AllData; namespace IceGrid { -using StringLongDict = ::std::map<::std::string, long long int>; +using StringLongDict = ::std::map<::std::string, ::std::int64_t>; } diff --git a/slice2cpp/cpp/test/Glacier2/dynamicFiltering/Test.h b/slice2cpp/cpp/test/Glacier2/dynamicFiltering/Test.h index a9b491de9745..33d1d6336f20 100644 --- a/slice2cpp/cpp/test/Glacier2/dynamicFiltering/Test.h +++ b/slice2cpp/cpp/test/Glacier2/dynamicFiltering/Test.h @@ -314,15 +314,15 @@ struct TestToken bool expectedResult; ::std::string description; ::Test::StateCode code; - short config; - short caseIndex; + ::std::int16_t config; + ::std::int16_t caseIndex; ::std::string testReference; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(expectedResult, description, code, config, caseIndex, testReference); } diff --git a/slice2cpp/cpp/test/Glacier2/override/Callback.cpp b/slice2cpp/cpp/test/Glacier2/override/Callback.cpp index 391c6fce0392..f13155d04b2b 100644 --- a/slice2cpp/cpp/test/Glacier2/override/Callback.cpp +++ b/slice2cpp/cpp/test/Glacier2/override/Callback.cpp @@ -74,19 +74,19 @@ const ::std::string iceC_Test_Callback_shutdown_name = "shutdown"; } void -Test::CallbackReceiverPrx::callback(int iceP_token, const ::Ice::Context& context) const +Test::CallbackReceiverPrx::callback(::std::int32_t iceP_token, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &CallbackReceiverPrx::_iceI_callback, iceP_token, context).get(); } ::std::future -Test::CallbackReceiverPrx::callbackAsync(int iceP_token, const ::Ice::Context& context) const +Test::CallbackReceiverPrx::callbackAsync(::std::int32_t iceP_token, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &CallbackReceiverPrx::_iceI_callback, iceP_token, context); } ::std::function -Test::CallbackReceiverPrx::callbackAsync(int iceP_token, +Test::CallbackReceiverPrx::callbackAsync(::std::int32_t iceP_token, ::std::function response, ::std::function ex, ::std::function sent, @@ -97,7 +97,7 @@ Test::CallbackReceiverPrx::callbackAsync(int iceP_token, /// \cond INTERNAL void -Test::CallbackReceiverPrx::_iceI_callback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_token, const ::Ice::Context& context) const +Test::CallbackReceiverPrx::_iceI_callback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_token, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_CallbackReceiver_callback_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -150,19 +150,19 @@ Test::CallbackReceiverPrx::ice_staticId() } void -Test::CallbackPrx::initiateCallback(const ::std::optional& iceP_proxy, int iceP_token, const ::Ice::Context& context) const +Test::CallbackPrx::initiateCallback(const ::std::optional& iceP_proxy, ::std::int32_t iceP_token, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &CallbackPrx::_iceI_initiateCallback, iceP_proxy, iceP_token, context).get(); } ::std::future -Test::CallbackPrx::initiateCallbackAsync(const ::std::optional& iceP_proxy, int iceP_token, const ::Ice::Context& context) const +Test::CallbackPrx::initiateCallbackAsync(const ::std::optional& iceP_proxy, ::std::int32_t iceP_token, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &CallbackPrx::_iceI_initiateCallback, iceP_proxy, iceP_token, context); } ::std::function -Test::CallbackPrx::initiateCallbackAsync(const ::std::optional& iceP_proxy, int iceP_token, +Test::CallbackPrx::initiateCallbackAsync(const ::std::optional& iceP_proxy, ::std::int32_t iceP_token, ::std::function response, ::std::function ex, ::std::function sent, @@ -173,7 +173,7 @@ Test::CallbackPrx::initiateCallbackAsync(const ::std::optional>& outAsync, const ::std::optional& iceP_proxy, int iceP_token, const ::Ice::Context& context) const +Test::CallbackPrx::_iceI_initiateCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_proxy, ::std::int32_t iceP_token, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Callback_initiateCallback_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -287,7 +287,7 @@ Test::CallbackReceiver::_iceD_callback(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_token; + ::std::int32_t iceP_token; istr->readAll(iceP_token); inS.endReadParams(); this->callback(iceP_token, current); @@ -388,7 +388,7 @@ Test::Callback::_iceD_initiateCallback(::IceInternal::Incoming& inS, const ::Ice _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::optional iceP_proxy; - int iceP_token; + ::std::int32_t iceP_token; istr->readAll(iceP_proxy, iceP_token); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); diff --git a/slice2cpp/cpp/test/Glacier2/override/Callback.h b/slice2cpp/cpp/test/Glacier2/override/Callback.h index 92cc7fdee639..98aa54819641 100644 --- a/slice2cpp/cpp/test/Glacier2/override/Callback.h +++ b/slice2cpp/cpp/test/Glacier2/override/Callback.h @@ -53,19 +53,19 @@ class CallbackReceiverPrx : public ::Ice::Proxy callbackAsync(int token, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future callbackAsync(::std::int32_t token, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - callbackAsync(int token, + callbackAsync(::std::int32_t token, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_callback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_callback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void callbackWithPayload(const ::Ice::ByteSeq& payload, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -135,19 +135,19 @@ class CallbackPrx : public ::Ice::Proxy { public: - void initiateCallback(const ::std::optional& proxy, int token, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void initiateCallback(const ::std::optional& proxy, ::std::int32_t token, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future initiateCallbackAsync(const ::std::optional& proxy, int token, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future initiateCallbackAsync(const ::std::optional& proxy, ::std::int32_t token, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - initiateCallbackAsync(const ::std::optional& proxy, int token, + initiateCallbackAsync(const ::std::optional& proxy, ::std::int32_t token, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_initiateCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, int, const ::Ice::Context&) const; + void _iceI_initiateCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void initiateCallbackWithPayload(const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -266,7 +266,7 @@ class CallbackReceiver : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void callback(int token, const ::Ice::Current& current) = 0; + virtual void callback(::std::int32_t token, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_callback(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -315,7 +315,7 @@ class Callback : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void initiateCallbackAsync(::std::optional proxy, int token, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void initiateCallbackAsync(::std::optional proxy, ::std::int32_t token, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_initiateCallback(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Glacier2/router/Callback.cpp b/slice2cpp/cpp/test/Glacier2/router/Callback.cpp index faa6b7ee0c47..0208b30a9b23 100644 --- a/slice2cpp/cpp/test/Glacier2/router/Callback.cpp +++ b/slice2cpp/cpp/test/Glacier2/router/Callback.cpp @@ -163,31 +163,31 @@ Test::CallbackReceiverPrx::_iceI_callbackEx(const ::std::shared_ptr<::IceInterna } /// \endcond -int -Test::CallbackReceiverPrx::concurrentCallback(int iceP_number, const ::Ice::Context& context) const +::std::int32_t +Test::CallbackReceiverPrx::concurrentCallback(::std::int32_t iceP_number, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &CallbackReceiverPrx::_iceI_concurrentCallback, iceP_number, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &CallbackReceiverPrx::_iceI_concurrentCallback, iceP_number, context).get(); } -::std::future -Test::CallbackReceiverPrx::concurrentCallbackAsync(int iceP_number, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::CallbackReceiverPrx::concurrentCallbackAsync(::std::int32_t iceP_number, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &CallbackReceiverPrx::_iceI_concurrentCallback, iceP_number, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &CallbackReceiverPrx::_iceI_concurrentCallback, iceP_number, context); } ::std::function -Test::CallbackReceiverPrx::concurrentCallbackAsync(int iceP_number, - ::std::function response, +Test::CallbackReceiverPrx::concurrentCallbackAsync(::std::int32_t iceP_number, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackReceiverPrx::_iceI_concurrentCallback, iceP_number, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackReceiverPrx::_iceI_concurrentCallback, iceP_number, context); } /// \cond INTERNAL void -Test::CallbackReceiverPrx::_iceI_concurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_number, const ::Ice::Context& context) const +Test::CallbackReceiverPrx::_iceI_concurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_number, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_CallbackReceiver_concurrentCallback_name); outAsync->invoke(iceC_Test_CallbackReceiver_concurrentCallback_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -355,31 +355,31 @@ Test::CallbackPrx::_iceI_initiateCallbackEx(const ::std::shared_ptr<::IceInterna } /// \endcond -int -Test::CallbackPrx::initiateConcurrentCallback(int iceP_number, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const +::std::int32_t +Test::CallbackPrx::initiateConcurrentCallback(::std::int32_t iceP_number, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &CallbackPrx::_iceI_initiateConcurrentCallback, iceP_number, iceP_proxy, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &CallbackPrx::_iceI_initiateConcurrentCallback, iceP_number, iceP_proxy, context).get(); } -::std::future -Test::CallbackPrx::initiateConcurrentCallbackAsync(int iceP_number, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::CallbackPrx::initiateConcurrentCallbackAsync(::std::int32_t iceP_number, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &CallbackPrx::_iceI_initiateConcurrentCallback, iceP_number, iceP_proxy, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &CallbackPrx::_iceI_initiateConcurrentCallback, iceP_number, iceP_proxy, context); } ::std::function -Test::CallbackPrx::initiateConcurrentCallbackAsync(int iceP_number, const ::std::optional& iceP_proxy, - ::std::function response, +Test::CallbackPrx::initiateConcurrentCallbackAsync(::std::int32_t iceP_number, const ::std::optional& iceP_proxy, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackPrx::_iceI_initiateConcurrentCallback, iceP_number, iceP_proxy, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackPrx::_iceI_initiateConcurrentCallback, iceP_number, iceP_proxy, context); } /// \cond INTERNAL void -Test::CallbackPrx::_iceI_initiateConcurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_number, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const +Test::CallbackPrx::_iceI_initiateConcurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_number, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Callback_initiateConcurrentCallback_name); outAsync->invoke(iceC_Test_Callback_initiateConcurrentCallback_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -564,11 +564,11 @@ Test::CallbackReceiver::_iceD_concurrentCallback(::IceInternal::Incoming& inS, c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_number; + ::std::int32_t iceP_number; istr->readAll(iceP_number); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -725,12 +725,12 @@ Test::Callback::_iceD_initiateConcurrentCallback(::IceInternal::Incoming& inS, c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_number; + ::std::int32_t iceP_number; ::std::optional iceP_proxy; istr->readAll(iceP_number, iceP_proxy); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/cpp/test/Glacier2/router/Callback.h b/slice2cpp/cpp/test/Glacier2/router/Callback.h index 7802cc35f5d8..bae60ac2617f 100644 --- a/slice2cpp/cpp/test/Glacier2/router/Callback.h +++ b/slice2cpp/cpp/test/Glacier2/router/Callback.h @@ -81,19 +81,19 @@ class CallbackReceiverPrx : public ::Ice::Proxy>&, const ::Ice::Context&) const; /// \endcond - int concurrentCallback(int number, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t concurrentCallback(::std::int32_t number, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future concurrentCallbackAsync(int number, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> concurrentCallbackAsync(::std::int32_t number, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - concurrentCallbackAsync(int number, - ::std::function response, + concurrentCallbackAsync(::std::int32_t number, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_concurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_concurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitCallback(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -207,19 +207,19 @@ class CallbackPrx : public ::Ice::Proxy void _iceI_initiateCallbackEx(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::Ice::Context&) const; /// \endcond - int initiateConcurrentCallback(int number, const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t initiateConcurrentCallback(::std::int32_t number, const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future initiateConcurrentCallbackAsync(int number, const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> initiateConcurrentCallbackAsync(::std::int32_t number, const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - initiateConcurrentCallbackAsync(int number, const ::std::optional& proxy, - ::std::function response, + initiateConcurrentCallbackAsync(::std::int32_t number, const ::std::optional& proxy, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_initiateConcurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::std::optional&, const ::Ice::Context&) const; + void _iceI_initiateConcurrentCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::std::optional&, const ::Ice::Context&) const; /// \endcond void initiateWaitCallback(const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -410,7 +410,7 @@ class CallbackReceiver : public virtual ::Ice::Object bool _iceD_callbackEx(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void concurrentCallbackAsync(int number, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void concurrentCallbackAsync(::std::int32_t number, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_concurrentCallback(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -474,7 +474,7 @@ class Callback : public virtual ::Ice::Object bool _iceD_initiateCallbackEx(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void initiateConcurrentCallbackAsync(int number, ::std::optional proxy, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void initiateConcurrentCallbackAsync(::std::int32_t number, ::std::optional proxy, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_initiateConcurrentCallback(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/acm/Test.cpp b/slice2cpp/cpp/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/cpp/test/Ice/acm/Test.cpp +++ b/slice2cpp/cpp/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/cpp/test/Ice/acm/Test.h b/slice2cpp/cpp/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/cpp/test/Ice/acm/Test.h +++ b/slice2cpp/cpp/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/ami/Test.cpp b/slice2cpp/cpp/test/Ice/ami/Test.cpp index 4b0805c46893..aaf0b0fcc579 100644 --- a/slice2cpp/cpp/test/Ice/ami/Test.cpp +++ b/slice2cpp/cpp/test/Ice/ami/Test.cpp @@ -236,30 +236,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -313,30 +313,30 @@ Test::TestIntfPrx::_iceI_opWithUE(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResultAndUE(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResultAndUE, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResultAndUE, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAndUEAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResultAndUE, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResultAndUE, context); } ::std::function -Test::TestIntfPrx::opWithResultAndUEAsync(::std::function response, +Test::TestIntfPrx::opWithResultAndUEAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResultAndUE, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResultAndUE, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResultAndUE_name); outAsync->invoke(iceC_Test_TestIntf_opWithResultAndUE_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -390,9 +390,9 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TestIntfPrx::opWithArgs(int& iceP_one, int& iceP_two, int& iceP_three, int& iceP_four, int& iceP_five, int& iceP_six, int& iceP_seven, int& iceP_eight, int& iceP_nine, int& iceP_ten, int& iceP_eleven, const ::Ice::Context& context) const +Test::TestIntfPrx::opWithArgs(::std::int32_t& iceP_one, ::std::int32_t& iceP_two, ::std::int32_t& iceP_three, ::std::int32_t& iceP_four, ::std::int32_t& iceP_five, ::std::int32_t& iceP_six, ::std::int32_t& iceP_seven, ::std::int32_t& iceP_eight, ::std::int32_t& iceP_nine, ::std::int32_t& iceP_ten, ::std::int32_t& iceP_eleven, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_opWithArgs, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_opWithArgs, context).get(); iceP_one = ::std::get<0>(_result); iceP_two = ::std::get<1>(_result); iceP_three = ::std::get<2>(_result); @@ -406,28 +406,28 @@ Test::TestIntfPrx::opWithArgs(int& iceP_one, int& iceP_two, int& iceP_three, int iceP_eleven = ::std::get<10>(_result); } -::std::future<::std::tuple> +::std::future<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>> Test::TestIntfPrx::opWithArgsAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithArgs, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithArgs, context); } ::std::function -Test::TestIntfPrx::opWithArgsAsync(::std::function response, +Test::TestIntfPrx::opWithArgsAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result), ::std::get<4>(_result), ::std::get<5>(_result), ::std::get<6>(_result), ::std::get<7>(_result), ::std::get<8>(_result), ::std::get<9>(_result), ::std::get<10>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithArgs, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithArgs, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithArgs_name); outAsync->invoke(iceC_Test_TestIntf_opWithArgs_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -435,37 +435,37 @@ Test::TestIntfPrx::_iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::Outgo nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<0>(v), ::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<4>(v), ::std::get<5>(v), ::std::get<6>(v), ::std::get<7>(v), ::std::get<8>(v), ::std::get<9>(v), ::std::get<10>(v)); return v; }); } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -475,19 +475,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -498,7 +498,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -546,19 +546,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -569,7 +569,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -846,37 +846,37 @@ Test::TestIntfControllerPrx::ice_staticId() return TestIntfController::ice_staticId(); } -int -Test::Outer::Inner::TestIntfPrx::op(int iceP_i, int& iceP_j, const ::Ice::Context& context) const +::std::int32_t +Test::Outer::Inner::TestIntfPrx::op(::std::int32_t iceP_i, ::std::int32_t& iceP_j, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); iceP_j = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); } ::std::function -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, - ::std::function response, +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); } /// \cond INTERNAL void -Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Outer_Inner_TestIntf_op_name); outAsync->invoke(iceC_Test_Outer_Inner_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -887,7 +887,7 @@ Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal: nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1047,7 +1047,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1073,7 +1073,7 @@ Test::TestIntf::_iceD_opWithResultAndUE(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResultAndUE(current); + ::std::int32_t ret = this->opWithResultAndUE(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1099,17 +1099,17 @@ Test::TestIntf::_iceD_opWithArgs(::IceInternal::Incoming& inS, const ::Ice::Curr { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int iceP_one; - int iceP_two; - int iceP_three; - int iceP_four; - int iceP_five; - int iceP_six; - int iceP_seven; - int iceP_eight; - int iceP_nine; - int iceP_ten; - int iceP_eleven; + ::std::int32_t iceP_one; + ::std::int32_t iceP_two; + ::std::int32_t iceP_three; + ::std::int32_t iceP_four; + ::std::int32_t iceP_five; + ::std::int32_t iceP_six; + ::std::int32_t iceP_seven; + ::std::int32_t iceP_eight; + ::std::int32_t iceP_nine; + ::std::int32_t iceP_ten; + ::std::int32_t iceP_eleven; this->opWithArgs(iceP_one, iceP_two, iceP_three, iceP_four, iceP_five, iceP_six, iceP_seven, iceP_eight, iceP_nine, iceP_ten, iceP_eleven, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_one, iceP_two, iceP_three, iceP_four, iceP_five, iceP_six, iceP_seven, iceP_eight, iceP_nine, iceP_ten, iceP_eleven); @@ -1124,7 +1124,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1138,7 +1138,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -1170,7 +1170,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -1488,11 +1488,11 @@ Test::Outer::Inner::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int iceP_j; - int ret = this->op(iceP_i, iceP_j, current); + ::std::int32_t iceP_j; + ::std::int32_t ret = this->op(iceP_i, iceP_j, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_j, ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/ami/Test.h b/slice2cpp/cpp/test/Ice/ami/Test.h index bdb9a36be6b9..595bb8f7998c 100644 --- a/slice2cpp/cpp/test/Ice/ami/Test.h +++ b/slice2cpp/cpp/test/Ice/ami/Test.h @@ -186,18 +186,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -214,18 +214,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opWithResultAndUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResultAndUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAndUEAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAndUEAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAndUEAsync(::std::function response, + opWithResultAndUEAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opBatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -242,47 +242,47 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void opWithArgs(int& one, int& two, int& three, int& four, int& five, int& six, int& seven, int& eight, int& nine, int& ten, int& eleven, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opWithArgs(::std::int32_t& one, ::std::int32_t& two, ::std::int32_t& three, ::std::int32_t& four, ::std::int32_t& five, ::std::int32_t& six, ::std::int32_t& seven, ::std::int32_t& eight, ::std::int32_t& nine, ::std::int32_t& ten, ::std::int32_t& eleven, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opWithArgsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>> opWithArgsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithArgsAsync(::std::function response, + opWithArgsAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; + void _iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -300,19 +300,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -538,19 +538,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(int i, int& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> opAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(int i, - ::std::function response, + opAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -733,7 +733,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -743,7 +743,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithUE(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResultAndUE(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResultAndUE(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResultAndUE(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -758,30 +758,30 @@ class TestIntf : public virtual ::Ice::Object */ struct OpWithArgsResult { - int one; - int two; - int three; - int four; - int five; - int six; - int seven; - int eight; - int nine; - int ten; - int eleven; + ::std::int32_t one; + ::std::int32_t two; + ::std::int32_t three; + ::std::int32_t four; + ::std::int32_t five; + ::std::int32_t six; + ::std::int32_t seven; + ::std::int32_t eight; + ::std::int32_t nine; + ::std::int32_t ten; + ::std::int32_t eleven; }; - virtual void opWithArgs(int& one, int& two, int& three, int& four, int& five, int& six, int& seven, int& eight, int& nine, int& ten, int& eleven, const ::Ice::Current& current) = 0; + virtual void opWithArgs(::std::int32_t& one, ::std::int32_t& two, ::std::int32_t& three, ::std::int32_t& four, ::std::int32_t& five, ::std::int32_t& six, ::std::int32_t& seven, ::std::int32_t& eight, ::std::int32_t& nine, ::std::int32_t& ten, ::std::int32_t& eleven, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithArgs(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -791,7 +791,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -925,11 +925,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpResult { - int returnValue; - int j; + ::std::int32_t returnValue; + ::std::int32_t j; }; - virtual int op(int i, int& j, const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/background/Test.cpp b/slice2cpp/cpp/test/Ice/background/Test.cpp index 45c9e717b01a..40882d6a46df 100644 --- a/slice2cpp/cpp/test/Ice/background/Test.cpp +++ b/slice2cpp/cpp/test/Ice/background/Test.cpp @@ -330,19 +330,19 @@ Test::BackgroundControllerPrx::_iceI_resumeAdapter(const ::std::shared_ptr<::Ice /// \endcond void -Test::BackgroundControllerPrx::initializeSocketOperation(int iceP_status, const ::Ice::Context& context) const +Test::BackgroundControllerPrx::initializeSocketOperation(::std::int32_t iceP_status, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &BackgroundControllerPrx::_iceI_initializeSocketOperation, iceP_status, context).get(); } ::std::future -Test::BackgroundControllerPrx::initializeSocketOperationAsync(int iceP_status, const ::Ice::Context& context) const +Test::BackgroundControllerPrx::initializeSocketOperationAsync(::std::int32_t iceP_status, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &BackgroundControllerPrx::_iceI_initializeSocketOperation, iceP_status, context); } ::std::function -Test::BackgroundControllerPrx::initializeSocketOperationAsync(int iceP_status, +Test::BackgroundControllerPrx::initializeSocketOperationAsync(::std::int32_t iceP_status, ::std::function response, ::std::function ex, ::std::function sent, @@ -353,7 +353,7 @@ Test::BackgroundControllerPrx::initializeSocketOperationAsync(int iceP_status, /// \cond INTERNAL void -Test::BackgroundControllerPrx::_iceI_initializeSocketOperation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_status, const ::Ice::Context& context) const +Test::BackgroundControllerPrx::_iceI_initializeSocketOperation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_status, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_BackgroundController_initializeSocketOperation_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -778,7 +778,7 @@ Test::BackgroundController::_iceD_initializeSocketOperation(::IceInternal::Incom { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_status; + ::std::int32_t iceP_status; istr->readAll(iceP_status); inS.endReadParams(); this->initializeSocketOperation(iceP_status, current); diff --git a/slice2cpp/cpp/test/Ice/background/Test.h b/slice2cpp/cpp/test/Ice/background/Test.h index ccb9b88e2b47..d7ad57f5c901 100644 --- a/slice2cpp/cpp/test/Ice/background/Test.h +++ b/slice2cpp/cpp/test/Ice/background/Test.h @@ -216,19 +216,19 @@ class TEST_API BackgroundControllerPrx : public ::Ice::Proxy>&, const ::Ice::Context&) const; /// \endcond - void initializeSocketOperation(int status, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void initializeSocketOperation(::std::int32_t status, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future initializeSocketOperationAsync(int status, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future initializeSocketOperationAsync(::std::int32_t status, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - initializeSocketOperationAsync(int status, + initializeSocketOperationAsync(::std::int32_t status, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_initializeSocketOperation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_initializeSocketOperation(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void initializeException(bool enable, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -482,7 +482,7 @@ class TEST_API BackgroundController : public virtual ::Ice::Object bool _iceD_resumeAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void initializeSocketOperation(int status, const ::Ice::Current& current) = 0; + virtual void initializeSocketOperation(::std::int32_t status, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_initializeSocketOperation(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/custom/Test.cpp b/slice2cpp/cpp/test/Ice/custom/Test.cpp index df50faa7332d..1e3c514682fa 100644 --- a/slice2cpp/cpp/test/Ice/custom/Test.cpp +++ b/slice2cpp/cpp/test/Ice/custom/Test.cpp @@ -304,7 +304,7 @@ Test::TestIntfPrx::_iceI_opBoolArray(const ::std::shared_ptr<::IceInternal::Outg /// \endcond ::Test::ByteList -Test::TestIntfPrx::opByteArray(const ::std::pair& iceP_inSeq, ByteList& iceP_outSeq, const ::Ice::Context& context) const +Test::TestIntfPrx::opByteArray(const ::std::pair& iceP_inSeq, ByteList& iceP_outSeq, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_opByteArray, iceP_inSeq, context).get(); iceP_outSeq = ::std::move(::std::get<1>(_result)); @@ -312,14 +312,14 @@ Test::TestIntfPrx::opByteArray(const ::std::pair> -Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const +Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_opByteArray, iceP_inSeq, context); } ::std::function -Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, - ::std::function, ::std::pair)> response, +Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, + ::std::function, ::std::pair)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -331,8 +331,8 @@ Test::TestIntfPrx::opByteArrayAsync(const ::std::pairstartEncapsulation(); - ::std::pair iceP_outSeq; - ::std::pair ret; + ::std::pair iceP_outSeq; + ::std::pair ret; istr->readAll(iceP_outSeq, ret); istr->endEncapsulation(); try @@ -358,7 +358,7 @@ Test::TestIntfPrx::opByteArrayAsync(const ::std::pair>>& outAsync, const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opByteArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opByteArray_name); outAsync->invoke(iceC_Test_TestIntf_opByteArray_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1910,7 +1910,7 @@ Test::TestIntfPrx::opOutArrayByteSeqAsync(const ByteSeq& iceP_org, const ::Ice:: ::std::function Test::TestIntfPrx::opOutArrayByteSeqAsync(const ByteSeq& iceP_org, - ::std::function)> response, + ::std::function)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1922,7 +1922,7 @@ Test::TestIntfPrx::opOutArrayByteSeqAsync(const ByteSeq& iceP_org, read = [response](::Ice::InputStream* istr) { istr->startEncapsulation(); - ::std::pair iceP_copy; + ::std::pair iceP_copy; istr->readAll(iceP_copy); istr->endEncapsulation(); try @@ -2044,37 +2044,37 @@ Test::TestIntfPrx::_iceI_opIntStringDict(const ::std::shared_ptr<::IceInternal:: } /// \endcond -::Test::CustomMap< ::Ice::Long, ::Ice::Long> +::Test::CustomMap< int64_t, int64_t> Test::TestIntfPrx::opVarDict(const ::Test::CustomMap& iceP_idict, ::Test::CustomMap& iceP_odict, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>(true, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>(true, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context).get(); iceP_odict = ::std::move(::std::get<1>(_result)); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>> +::std::future<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>> Test::TestIntfPrx::opVarDictAsync(const ::Test::CustomMap& iceP_idict, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>, ::std::promise>(false, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context); + return _makePromiseOutgoing<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>, ::std::promise>(false, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context); } ::std::function Test::TestIntfPrx::opVarDictAsync(const ::Test::CustomMap& iceP_idict, - ::std::function, ::Test::CustomMap)> response, + ::std::function, ::Test::CustomMap)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>&& _result) + auto _responseCb = [response](::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result))); }; - return _makeLambdaOutgoing<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opVarDict, iceP_idict, context); + return _makeLambdaOutgoing<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opVarDict, iceP_idict, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>>& outAsync, const ::Test::CustomMap& iceP_idict, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>>& outAsync, const ::Test::CustomMap& iceP_idict, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opVarDict_name); outAsync->invoke(iceC_Test_TestIntf_opVarDict_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2085,7 +2085,7 @@ Test::TestIntfPrx::_iceI_opVarDict(const ::std::shared_ptr<::IceInternal::Outgoi nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap> v; + ::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2448,7 +2448,7 @@ Test::TestIntf::_iceD_opByteArray(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::std::pair iceP_inSeq; + ::std::pair iceP_inSeq; istr->readAll(iceP_inSeq); inS.endReadParams(); ByteList iceP_outSeq; @@ -3070,7 +3070,7 @@ Test::TestIntf::_iceD_opVarDict(::IceInternal::Incoming& inS, const ::Ice::Curre istr->readAll(iceP_idict); inS.endReadParams(); ::Test::CustomMap iceP_odict; - ::Test::CustomMap< ::Ice::Long, ::Ice::Long> ret = this->opVarDict(::std::move(iceP_idict), iceP_odict, current); + ::Test::CustomMap< int64_t, int64_t> ret = this->opVarDict(::std::move(iceP_idict), iceP_odict, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_odict, ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/custom/Test.h b/slice2cpp/cpp/test/Ice/custom/Test.h index 7e578e0c6837..6586bb805001 100644 --- a/slice2cpp/cpp/test/Ice/custom/Test.h +++ b/slice2cpp/cpp/test/Ice/custom/Test.h @@ -68,7 +68,7 @@ using BoolSeqList = std::list< ::Test::BoolSeq>; using BoolDequeList = std::list >; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using ByteList = std::list< ::Ice::Byte>; @@ -165,9 +165,9 @@ using ClassStructSeq = ::std::vector; using IntStringDict = Test::CustomMap; -using LongLongDict = ::std::map; +using LongLongDict = ::std::map<::std::int64_t, ::std::int64_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; using BoolBuffer = Test::CustomBuffer; @@ -175,7 +175,7 @@ using ShortBuffer = Test::CustomBuffer; using IntBuffer = Test::CustomBuffer; -using LongBuffer = Test::CustomBuffer; +using LongBuffer = Test::CustomBuffer; using FloatBuffer = Test::CustomBuffer; @@ -274,19 +274,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBoolArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::pair&, const ::Ice::Context&) const; /// \endcond - ByteList opByteArray(const ::std::pair& inSeq, ByteList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ByteList opByteArray(const ::std::pair& inSeq, ByteList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opByteArrayAsync(const ::std::pair& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> opByteArrayAsync(const ::std::pair& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteArrayAsync(const ::std::pair& inSeq, - ::std::function, ::std::pair)> response, + opByteArrayAsync(const ::std::pair& inSeq, + ::std::function, ::std::pair)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::pair&, const ::Ice::Context&) const; + void _iceI_opByteArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::pair&, const ::Ice::Context&) const; /// \endcond VariableList opVariableArray(const ::std::pair& inSeq, VariableList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -745,7 +745,7 @@ class TestIntfPrx : public ::Ice::Proxy ::std::function opOutArrayByteSeqAsync(const ByteSeq& org, - ::std::function)> response, + ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -784,19 +784,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opIntStringDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const IntStringDict&, const ::Ice::Context&) const; /// \endcond - ::Test::CustomMap< ::Ice::Long, ::Ice::Long> opVarDict(const ::Test::CustomMap& idict, ::Test::CustomMap& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::Test::CustomMap< int64_t, int64_t> opVarDict(const ::Test::CustomMap& idict, ::Test::CustomMap& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>> opVarDictAsync(const ::Test::CustomMap& idict, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>> opVarDictAsync(const ::Test::CustomMap& idict, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function opVarDictAsync(const ::Test::CustomMap& idict, - ::std::function, ::Test::CustomMap)> response, + ::std::function, ::Test::CustomMap)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>>&, const ::Test::CustomMap&, const ::Ice::Context&) const; + void _iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>>&, const ::Test::CustomMap&, const ::Ice::Context&) const; /// \endcond ::Test::CustomMap< ::Ice::Int, std::string> opCustomIntStringDict(const ::std::map< ::Ice::Int, ::Util::string_view>& idict, ::Test::CustomMap< ::Ice::Int, std::string>& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -928,13 +928,13 @@ namespace Test struct Fixed { - short s; + ::std::int16_t s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(s); } @@ -958,13 +958,13 @@ struct Variable struct ClassOtherStruct { - int x; + ::std::int32_t x; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x); } @@ -974,13 +974,13 @@ struct ClassStruct { ::Test::ClassOtherStructSeq otherSeq; ::Test::ClassOtherStruct other; - int y; + ::std::int32_t y; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(otherSeq, other, y); } @@ -1201,7 +1201,7 @@ class TestIntf : public virtual ::Ice::Object ByteList outSeq; }; - virtual ByteList opByteArray(::std::pair inSeq, ByteList& outSeq, const ::Ice::Current& current) = 0; + virtual ByteList opByteArray(::std::pair inSeq, ByteList& outSeq, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteArray(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1656,11 +1656,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpVarDictResult { - ::Test::CustomMap< ::Ice::Long, ::Ice::Long> returnValue; + ::Test::CustomMap< int64_t, int64_t> returnValue; ::Test::CustomMap odict; }; - virtual ::Test::CustomMap< ::Ice::Long, ::Ice::Long> opVarDict(::Test::CustomMap idict, ::Test::CustomMap& odict, const ::Ice::Current& current) = 0; + virtual ::Test::CustomMap< int64_t, int64_t> opVarDict(::Test::CustomMap idict, ::Test::CustomMap& odict, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVarDict(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/custom/TestAMD.cpp b/slice2cpp/cpp/test/Ice/custom/TestAMD.cpp index 1610d847187e..93ad6ab80b80 100644 --- a/slice2cpp/cpp/test/Ice/custom/TestAMD.cpp +++ b/slice2cpp/cpp/test/Ice/custom/TestAMD.cpp @@ -248,7 +248,7 @@ Test::TestIntfPrx::_iceI_opBoolArray(const ::std::shared_ptr<::IceInternal::Outg /// \endcond ::Test::ByteList -Test::TestIntfPrx::opByteArray(const ::std::pair& iceP_inSeq, ByteList& iceP_outSeq, const ::Ice::Context& context) const +Test::TestIntfPrx::opByteArray(const ::std::pair& iceP_inSeq, ByteList& iceP_outSeq, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_opByteArray, iceP_inSeq, context).get(); iceP_outSeq = ::std::move(::std::get<1>(_result)); @@ -256,14 +256,14 @@ Test::TestIntfPrx::opByteArray(const ::std::pair> -Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const +Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_opByteArray, iceP_inSeq, context); } ::std::function -Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, - ::std::function, ::std::pair)> response, +Test::TestIntfPrx::opByteArrayAsync(const ::std::pair& iceP_inSeq, + ::std::function, ::std::pair)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -275,8 +275,8 @@ Test::TestIntfPrx::opByteArrayAsync(const ::std::pairstartEncapsulation(); - ::std::pair iceP_outSeq; - ::std::pair ret; + ::std::pair iceP_outSeq; + ::std::pair ret; istr->readAll(iceP_outSeq, ret); istr->endEncapsulation(); try @@ -302,7 +302,7 @@ Test::TestIntfPrx::opByteArrayAsync(const ::std::pair>>& outAsync, const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opByteArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::std::pair& iceP_inSeq, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opByteArray_name); outAsync->invoke(iceC_Test_TestIntf_opByteArray_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1660,7 +1660,7 @@ Test::TestIntfPrx::opOutArrayByteSeqAsync(const ByteSeq& iceP_org, const ::Ice:: ::std::function Test::TestIntfPrx::opOutArrayByteSeqAsync(const ByteSeq& iceP_org, - ::std::function)> response, + ::std::function)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1672,7 +1672,7 @@ Test::TestIntfPrx::opOutArrayByteSeqAsync(const ByteSeq& iceP_org, read = [response](::Ice::InputStream* istr) { istr->startEncapsulation(); - ::std::pair iceP_copy; + ::std::pair iceP_copy; istr->readAll(iceP_copy); istr->endEncapsulation(); try @@ -1794,37 +1794,37 @@ Test::TestIntfPrx::_iceI_opIntStringDict(const ::std::shared_ptr<::IceInternal:: } /// \endcond -::Test::CustomMap< ::Ice::Long, ::Ice::Long> +::Test::CustomMap< int64_t, int64_t> Test::TestIntfPrx::opVarDict(const ::Test::CustomMap& iceP_idict, ::Test::CustomMap& iceP_odict, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>(true, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>(true, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context).get(); iceP_odict = ::std::move(::std::get<1>(_result)); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>> +::std::future<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>> Test::TestIntfPrx::opVarDictAsync(const ::Test::CustomMap& iceP_idict, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>, ::std::promise>(false, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context); + return _makePromiseOutgoing<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>, ::std::promise>(false, this, &TestIntfPrx::_iceI_opVarDict, iceP_idict, context); } ::std::function Test::TestIntfPrx::opVarDictAsync(const ::Test::CustomMap& iceP_idict, - ::std::function, ::Test::CustomMap)> response, + ::std::function, ::Test::CustomMap)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>&& _result) + auto _responseCb = [response](::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result))); }; - return _makeLambdaOutgoing<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opVarDict, iceP_idict, context); + return _makeLambdaOutgoing<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opVarDict, iceP_idict, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>>& outAsync, const ::Test::CustomMap& iceP_idict, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>>& outAsync, const ::Test::CustomMap& iceP_idict, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opVarDict_name); outAsync->invoke(iceC_Test_TestIntf_opVarDict_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1835,7 +1835,7 @@ Test::TestIntfPrx::_iceI_opVarDict(const ::std::shared_ptr<::IceInternal::Outgoi nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap> v; + ::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2206,11 +2206,11 @@ Test::TestIntf::_iceD_opByteArray(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::std::pair iceP_inSeq; + ::std::pair iceP_inSeq; istr->readAll(iceP_inSeq); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::std::pair& ret, const ::std::pair& iceP_outSeq) + auto responseCB = [inA](const ::std::pair& ret, const ::std::pair& iceP_outSeq) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_outSeq, ret); @@ -2831,7 +2831,7 @@ Test::TestIntf::_iceD_opOutArrayByteSeq(::IceInternal::Incoming& inS, const ::Ic istr->readAll(iceP_org); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::std::pair& iceP_copy) + auto responseCB = [inA](const ::std::pair& iceP_copy) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_copy); @@ -2897,7 +2897,7 @@ Test::TestIntf::_iceD_opVarDict(::IceInternal::Incoming& inS, const ::Ice::Curre istr->readAll(iceP_idict); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::Test::CustomMap< ::Ice::Long, ::Ice::Long>& ret, const ::Test::CustomMap& iceP_odict) + auto responseCB = [inA](const ::Test::CustomMap< int64_t, int64_t>& ret, const ::Test::CustomMap& iceP_odict) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_odict, ret); diff --git a/slice2cpp/cpp/test/Ice/custom/TestAMD.h b/slice2cpp/cpp/test/Ice/custom/TestAMD.h index 9f6a465d8c18..962ca2a28075 100644 --- a/slice2cpp/cpp/test/Ice/custom/TestAMD.h +++ b/slice2cpp/cpp/test/Ice/custom/TestAMD.h @@ -66,7 +66,7 @@ using BoolListSeq = ::std::vector; using BoolSeqList = std::list< ::Test::BoolSeq>; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using ByteList = std::list< ::Ice::Byte>; @@ -163,9 +163,9 @@ using ClassStructSeq = ::std::vector; using IntStringDict = Test::CustomMap; -using LongLongDict = ::std::map; +using LongLongDict = ::std::map<::std::int64_t, ::std::int64_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; using BoolBuffer = Test::CustomBuffer; @@ -173,7 +173,7 @@ using ShortBuffer = Test::CustomBuffer; using IntBuffer = Test::CustomBuffer; -using LongBuffer = Test::CustomBuffer; +using LongBuffer = Test::CustomBuffer; using FloatBuffer = Test::CustomBuffer; @@ -272,19 +272,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBoolArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::pair&, const ::Ice::Context&) const; /// \endcond - ByteList opByteArray(const ::std::pair& inSeq, ByteList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ByteList opByteArray(const ::std::pair& inSeq, ByteList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opByteArrayAsync(const ::std::pair& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> opByteArrayAsync(const ::std::pair& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteArrayAsync(const ::std::pair& inSeq, - ::std::function, ::std::pair)> response, + opByteArrayAsync(const ::std::pair& inSeq, + ::std::function, ::std::pair)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::pair&, const ::Ice::Context&) const; + void _iceI_opByteArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::pair&, const ::Ice::Context&) const; /// \endcond VariableList opVariableArray(const ::std::pair& inSeq, VariableList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -698,7 +698,7 @@ class TestIntfPrx : public ::Ice::Proxy ::std::function opOutArrayByteSeqAsync(const ByteSeq& org, - ::std::function)> response, + ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -737,19 +737,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opIntStringDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const IntStringDict&, const ::Ice::Context&) const; /// \endcond - ::Test::CustomMap< ::Ice::Long, ::Ice::Long> opVarDict(const ::Test::CustomMap& idict, ::Test::CustomMap& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::Test::CustomMap< int64_t, int64_t> opVarDict(const ::Test::CustomMap& idict, ::Test::CustomMap& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>> opVarDictAsync(const ::Test::CustomMap& idict, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>> opVarDictAsync(const ::Test::CustomMap& idict, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function opVarDictAsync(const ::Test::CustomMap& idict, - ::std::function, ::Test::CustomMap)> response, + ::std::function, ::Test::CustomMap)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< ::Ice::Long, ::Ice::Long>, ::Test::CustomMap>>>&, const ::Test::CustomMap&, const ::Ice::Context&) const; + void _iceI_opVarDict(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Test::CustomMap< int64_t, int64_t>, ::Test::CustomMap>>>&, const ::Test::CustomMap&, const ::Ice::Context&) const; /// \endcond ::Test::CustomMap< ::Ice::Int, std::string> opCustomIntStringDict(const ::std::map< ::Ice::Int, ::Util::string_view>& idict, ::Test::CustomMap< ::Ice::Int, std::string>& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -881,13 +881,13 @@ namespace Test struct Fixed { - short s; + ::std::int16_t s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(s); } @@ -911,13 +911,13 @@ struct Variable struct ClassOtherStruct { - int x; + ::std::int32_t x; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x); } @@ -927,13 +927,13 @@ struct ClassStruct { ::Test::ClassOtherStructSeq otherSeq; ::Test::ClassOtherStruct other; - int y; + ::std::int32_t y; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(otherSeq, other, y); } @@ -1154,7 +1154,7 @@ class TestIntf : public virtual ::Ice::Object ByteList outSeq; }; - virtual void opByteArrayAsync(::std::pair inSeq, ::std::function& returnValue, const ::std::pair& outSeq)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteArrayAsync(::std::pair inSeq, ::std::function& returnValue, const ::std::pair& outSeq)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteArray(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1538,7 +1538,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opClassStruct(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOutArrayByteSeqAsync(ByteSeq org, ::std::function& copy)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opOutArrayByteSeqAsync(ByteSeq org, ::std::function& copy)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOutArrayByteSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1567,11 +1567,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpVarDictResult { - ::Test::CustomMap< ::Ice::Long, ::Ice::Long> returnValue; + ::Test::CustomMap< int64_t, int64_t> returnValue; ::Test::CustomMap odict; }; - virtual void opVarDictAsync(::Test::CustomMap idict, ::std::function& returnValue, const ::Test::CustomMap& odict)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opVarDictAsync(::Test::CustomMap idict, ::std::function& returnValue, const ::Test::CustomMap& odict)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVarDict(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/defaultValue/Test.h b/slice2cpp/cpp/test/Ice/defaultValue/Test.h index 708beb2e173e..0b08591d6415 100644 --- a/slice2cpp/cpp/test/Ice/defaultValue/Test.h +++ b/slice2cpp/cpp/test/Ice/defaultValue/Test.h @@ -67,13 +67,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -93,9 +93,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -114,10 +114,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -128,8 +128,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -139,7 +139,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -148,10 +148,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -161,8 +161,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -172,7 +172,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -182,10 +182,10 @@ struct Struct3 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -196,8 +196,8 @@ struct Struct3 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -207,7 +207,7 @@ struct Struct3 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -241,7 +241,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -265,7 +265,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -278,16 +278,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -314,7 +314,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -329,7 +329,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -366,7 +366,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -390,7 +390,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -403,16 +403,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -436,7 +436,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -451,7 +451,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/cpp/test/Ice/dispatcher/Test.cpp b/slice2cpp/cpp/test/Ice/dispatcher/Test.cpp index 5cbc3cb5e5f5..77ed4d8ca345 100644 --- a/slice2cpp/cpp/test/Ice/dispatcher/Test.cpp +++ b/slice2cpp/cpp/test/Ice/dispatcher/Test.cpp @@ -107,19 +107,19 @@ Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsync /// \endcond void -Test::TestIntfPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_to, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -130,7 +130,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -324,7 +324,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); diff --git a/slice2cpp/cpp/test/Ice/dispatcher/Test.h b/slice2cpp/cpp/test/Ice/dispatcher/Test.h index eb5f2107e53f..2582f57cb89a 100644 --- a/slice2cpp/cpp/test/Ice/dispatcher/Test.h +++ b/slice2cpp/cpp/test/Ice/dispatcher/Test.h @@ -67,19 +67,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opWithPayload(const ::Ice::ByteSeq& seq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -283,7 +283,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/enums/Test.h b/slice2cpp/cpp/test/Ice/enums/Test.h index 2a0b5da8f18d..83abf5f1e817 100644 --- a/slice2cpp/cpp/test/Ice/enums/Test.h +++ b/slice2cpp/cpp/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/cpp/test/Ice/exceptions/Test.cpp b/slice2cpp/cpp/test/Ice/exceptions/Test.cpp index bd6a59049f3b..afae6a99cf6c 100644 --- a/slice2cpp/cpp/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/cpp/test/Ice/exceptions/Test.cpp @@ -236,19 +236,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -259,7 +259,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -285,19 +285,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -308,7 +308,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -338,19 +338,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -361,7 +361,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -387,19 +387,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -410,7 +410,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -436,19 +436,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -459,7 +459,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -485,19 +485,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -508,7 +508,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -534,19 +534,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -557,7 +557,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -583,19 +583,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -606,7 +606,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -632,19 +632,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -655,7 +655,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -667,19 +667,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -690,7 +690,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -702,19 +702,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -725,7 +725,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1188,7 +1188,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1203,7 +1203,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1218,8 +1218,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1234,9 +1234,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1251,8 +1251,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1267,9 +1267,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1284,9 +1284,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1301,8 +1301,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); this->throwModA(iceP_a, iceP_a2, current); @@ -1317,7 +1317,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1332,8 +1332,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1348,9 +1348,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/cpp/test/Ice/exceptions/Test.h b/slice2cpp/cpp/test/Ice/exceptions/Test.h index 358ff5cb7363..99dc913a63cb 100644 --- a/slice2cpp/cpp/test/Ice/exceptions/Test.h +++ b/slice2cpp/cpp/test/Ice/exceptions/Test.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -558,7 +558,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -567,7 +567,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -578,7 +578,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -598,7 +598,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -608,7 +608,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -619,7 +619,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -635,7 +635,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -645,7 +645,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -656,7 +656,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -672,7 +672,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -681,7 +681,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -692,7 +692,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; class E : public ::Ice::UserExceptionHelper @@ -788,7 +788,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -798,7 +798,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -809,7 +809,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -903,57 +903,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModA(int a, int a2, const ::Ice::Current& current) = 0; + virtual void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/exceptions/TestAMD.cpp b/slice2cpp/cpp/test/Ice/exceptions/TestAMD.cpp index e498bc638b62..be39601bad32 100644 --- a/slice2cpp/cpp/test/Ice/exceptions/TestAMD.cpp +++ b/slice2cpp/cpp/test/Ice/exceptions/TestAMD.cpp @@ -240,19 +240,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -263,7 +263,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -289,19 +289,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -312,7 +312,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -342,19 +342,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -365,7 +365,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -391,19 +391,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -414,7 +414,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -440,19 +440,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -463,7 +463,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -489,19 +489,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -512,7 +512,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -538,19 +538,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -561,7 +561,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -587,19 +587,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -610,7 +610,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -636,19 +636,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -659,7 +659,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -671,19 +671,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -694,7 +694,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -706,19 +706,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -729,7 +729,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1292,7 +1292,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1307,7 +1307,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1322,8 +1322,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1338,9 +1338,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1355,8 +1355,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1371,9 +1371,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1388,9 +1388,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1405,8 +1405,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1421,7 +1421,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1436,8 +1436,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1452,9 +1452,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); diff --git a/slice2cpp/cpp/test/Ice/exceptions/TestAMD.h b/slice2cpp/cpp/test/Ice/exceptions/TestAMD.h index 2a857f4fb915..4987b643b91f 100644 --- a/slice2cpp/cpp/test/Ice/exceptions/TestAMD.h +++ b/slice2cpp/cpp/test/Ice/exceptions/TestAMD.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -586,7 +586,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -595,7 +595,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -606,7 +606,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -626,7 +626,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -636,7 +636,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -647,7 +647,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -663,7 +663,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -673,7 +673,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -684,7 +684,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -700,7 +700,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -709,7 +709,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -720,7 +720,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; class E : public ::Ice::UserExceptionHelper @@ -816,7 +816,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -826,7 +826,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -837,7 +837,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -931,57 +931,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorDAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasAAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasAAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasBAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModAAsync(int a, int a2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/faultTolerance/Test.cpp b/slice2cpp/cpp/test/Ice/faultTolerance/Test.cpp index 8c29b5e9015d..88d4a9960180 100644 --- a/slice2cpp/cpp/test/Ice/faultTolerance/Test.cpp +++ b/slice2cpp/cpp/test/Ice/faultTolerance/Test.cpp @@ -151,30 +151,30 @@ Test::TestIntfPrx::_iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int +::std::int32_t Test::TestIntfPrx::pid(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_pid, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_pid, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::pidAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_pid, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_pid, context); } ::std::function -Test::TestIntfPrx::pidAsync(::std::function response, +Test::TestIntfPrx::pidAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_pid_name); outAsync->invoke(iceC_Test_TestIntf_pid_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -256,7 +256,7 @@ Test::TestIntf::_iceD_pid(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->pid(current); + ::std::int32_t ret = this->pid(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/faultTolerance/Test.h b/slice2cpp/cpp/test/Ice/faultTolerance/Test.h index 252456e2c21b..e1626ef6e479 100644 --- a/slice2cpp/cpp/test/Ice/faultTolerance/Test.h +++ b/slice2cpp/cpp/test/Ice/faultTolerance/Test.h @@ -90,18 +90,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - pidAsync(::std::function response, + pidAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -206,7 +206,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_idempotentAbort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int pid(const ::Ice::Current& current) = 0; + virtual ::std::int32_t pid(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_pid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/hold/Test.cpp b/slice2cpp/cpp/test/Ice/hold/Test.cpp index 9e0f56e0145d..feb78e98de3d 100644 --- a/slice2cpp/cpp/test/Ice/hold/Test.cpp +++ b/slice2cpp/cpp/test/Ice/hold/Test.cpp @@ -61,19 +61,19 @@ const ::std::string iceC_Test_Hold_shutdown_name = "shutdown"; } void -Test::HoldPrx::putOnHold(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context).get(); } ::std::future -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context); } ::std::function -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HoldPrx::putOnHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_putOnHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -127,19 +127,19 @@ Test::HoldPrx::_iceI_waitForHold(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::HoldPrx::setOneway(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOneway(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context).get(); } ::std::future -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context); } ::std::function -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -150,7 +150,7 @@ Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, /// \cond INTERNAL void -Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_setOneway_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -161,31 +161,31 @@ Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -int -Test::HoldPrx::set(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::int32_t +Test::HoldPrx::set(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); } -::std::future -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } ::std::function -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, - ::std::function response, +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } /// \cond INTERNAL void -Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_delay, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hold_set_name); outAsync->invoke(iceC_Test_Hold_set_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -265,7 +265,7 @@ Test::Hold::_iceD_putOnHold(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->putOnHold(iceP_seconds, current); @@ -292,8 +292,8 @@ Test::Hold::_iceD_setOneway(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_expected; + ::std::int32_t iceP_value; + ::std::int32_t iceP_expected; istr->readAll(iceP_value, iceP_expected); inS.endReadParams(); this->setOneway(iceP_value, iceP_expected, current); @@ -308,11 +308,11 @@ Test::Hold::_iceD_set(::IceInternal::Incoming& inS, const ::Ice::Current& curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_delay; + ::std::int32_t iceP_value; + ::std::int32_t iceP_delay; istr->readAll(iceP_value, iceP_delay); inS.endReadParams(); - int ret = this->set(iceP_value, iceP_delay, current); + ::std::int32_t ret = this->set(iceP_value, iceP_delay, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/hold/Test.h b/slice2cpp/cpp/test/Ice/hold/Test.h index 6767cf758c7e..e02713366f9c 100644 --- a/slice2cpp/cpp/test/Ice/hold/Test.h +++ b/slice2cpp/cpp/test/Ice/hold/Test.h @@ -48,19 +48,19 @@ class HoldPrx : public ::Ice::Proxy { public: - void putOnHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void putOnHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future putOnHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future putOnHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - putOnHoldAsync(int seconds, + putOnHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitForHold(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -77,34 +77,34 @@ class HoldPrx : public ::Ice::Proxy void _iceI_waitForHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void setOneway(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setOnewayAsync(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setOnewayAsync(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setOnewayAsync(int value, int expected, + setOnewayAsync(::std::int32_t value, ::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int set(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setAsync(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> setAsync(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setAsync(int value, int delay, - ::std::function response, + setAsync(::std::int32_t value, ::std::int32_t delay, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -208,7 +208,7 @@ class Hold : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void putOnHold(int seconds, const ::Ice::Current& current) = 0; + virtual void putOnHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_putOnHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -218,12 +218,12 @@ class Hold : public virtual ::Ice::Object bool _iceD_waitForHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void setOneway(int value, int expected, const ::Ice::Current& current) = 0; + virtual void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int set(int value, int delay, const ::Ice::Current& current) = 0; + virtual ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_set(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/inheritance/Test.h b/slice2cpp/cpp/test/Ice/inheritance/Test.h index e92e7a373cdc..d9165bc4e395 100644 --- a/slice2cpp/cpp/test/Ice/inheritance/Test.h +++ b/slice2cpp/cpp/test/Ice/inheritance/Test.h @@ -609,7 +609,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -618,7 +618,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -629,7 +629,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; /// \cond INTERNAL @@ -652,7 +652,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -662,7 +662,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -673,7 +673,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -692,7 +692,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -702,7 +702,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -713,7 +713,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -732,7 +732,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -742,7 +742,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -753,7 +753,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -777,7 +777,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -786,7 +786,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -797,7 +797,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -816,7 +816,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -826,7 +826,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -837,7 +837,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -856,7 +856,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -866,7 +866,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -877,7 +877,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -896,7 +896,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -906,7 +906,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -917,7 +917,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -941,7 +941,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -950,7 +950,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -961,7 +961,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -980,7 +980,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -990,7 +990,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1001,7 +1001,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1020,7 +1020,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1030,7 +1030,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1041,7 +1041,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1060,7 +1060,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1070,7 +1070,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1081,7 +1081,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1105,7 +1105,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1114,7 +1114,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1125,7 +1125,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1144,7 +1144,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1154,7 +1154,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1165,7 +1165,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1184,7 +1184,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1194,7 +1194,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1205,7 +1205,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1224,7 +1224,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1234,7 +1234,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1245,7 +1245,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1269,7 +1269,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1278,7 +1278,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1289,7 +1289,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1308,7 +1308,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1318,7 +1318,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1329,7 +1329,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1348,7 +1348,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1358,7 +1358,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1369,7 +1369,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1388,7 +1388,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1398,7 +1398,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1409,7 +1409,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1433,7 +1433,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1442,7 +1442,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1453,7 +1453,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1472,7 +1472,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1482,7 +1482,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1493,7 +1493,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1512,7 +1512,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1522,7 +1522,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1533,7 +1533,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1552,7 +1552,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1562,7 +1562,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1573,7 +1573,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } diff --git a/slice2cpp/cpp/test/Ice/interceptor/Test.cpp b/slice2cpp/cpp/test/Ice/interceptor/Test.cpp index 42a7ebe6926b..92d491fde272 100644 --- a/slice2cpp/cpp/test/Ice/interceptor/Test.cpp +++ b/slice2cpp/cpp/test/Ice/interceptor/Test.cpp @@ -75,31 +75,31 @@ const ::std::string iceC_Test_MyObject_amdBadSystemAdd_name = "amdBadSystemAdd"; } -int -Test::MyObjectPrx::add(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::add(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_add_name); outAsync->invoke(iceC_Test_MyObject_add_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -111,31 +111,31 @@ Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyn } /// \endcond -int -Test::MyObjectPrx::addWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::addWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_addWithRetry_name); outAsync->invoke(iceC_Test_MyObject_addWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -147,31 +147,31 @@ Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::badAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badAdd_name); outAsync->invoke(iceC_Test_MyObject_badAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -196,31 +196,31 @@ Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::notExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::notExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_notExistAdd_name); outAsync->invoke(iceC_Test_MyObject_notExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -232,31 +232,31 @@ Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::Outg } /// \endcond -int -Test::MyObjectPrx::badSystemAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badSystemAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badSystemAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badSystemAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badSystemAdd_name); outAsync->invoke(iceC_Test_MyObject_badSystemAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -268,31 +268,31 @@ Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::amdAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAdd_name); outAsync->invoke(iceC_Test_MyObject_amdAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -304,31 +304,31 @@ Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::amdAddWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAddWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAddWithRetry_name); outAsync->invoke(iceC_Test_MyObject_amdAddWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -340,31 +340,31 @@ Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int -Test::MyObjectPrx::amdBadAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -389,31 +389,31 @@ Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::Outgoi } /// \endcond -int -Test::MyObjectPrx::amdNotExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdNotExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdNotExistAdd_name); outAsync->invoke(iceC_Test_MyObject_amdNotExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -425,31 +425,31 @@ Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::O } /// \endcond -int -Test::MyObjectPrx::amdBadSystemAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadSystemAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadSystemAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadSystemAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadSystemAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadSystemAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -509,11 +509,11 @@ Test::MyObject::_iceD_add(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->add(iceP_x, iceP_y, current); + ::std::int32_t ret = this->add(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -527,11 +527,11 @@ Test::MyObject::_iceD_addWithRetry(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->addWithRetry(iceP_x, iceP_y, current); + ::std::int32_t ret = this->addWithRetry(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -545,11 +545,11 @@ Test::MyObject::_iceD_badAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -563,11 +563,11 @@ Test::MyObject::_iceD_notExistAdd(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->notExistAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->notExistAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -581,11 +581,11 @@ Test::MyObject::_iceD_badSystemAdd(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badSystemAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badSystemAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -599,12 +599,12 @@ Test::MyObject::_iceD_amdAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -622,12 +622,12 @@ Test::MyObject::_iceD_amdAddWithRetry(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -645,12 +645,12 @@ Test::MyObject::_iceD_amdBadAdd(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -668,12 +668,12 @@ Test::MyObject::_iceD_amdNotExistAdd(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -691,12 +691,12 @@ Test::MyObject::_iceD_amdBadSystemAdd(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/cpp/test/Ice/interceptor/Test.h b/slice2cpp/cpp/test/Ice/interceptor/Test.h index 758146ef6035..9574399732e4 100644 --- a/slice2cpp/cpp/test/Ice/interceptor/Test.h +++ b/slice2cpp/cpp/test/Ice/interceptor/Test.h @@ -58,154 +58,154 @@ class INTERCEPTOR_TEST_API MyObjectPrx : public ::Ice::Proxy addAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addAsync(int x, int y, - ::std::function response, + addAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int addWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addWithRetryAsync(int x, int y, - ::std::function response, + addWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badAddAsync(int x, int y, - ::std::function response, + badAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int notExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future notExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> notExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - notExistAddAsync(int x, int y, - ::std::function response, + notExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badSystemAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badSystemAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badSystemAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badSystemAddAsync(int x, int y, - ::std::function response, + badSystemAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddAsync(int x, int y, - ::std::function response, + amdAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAddWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAddWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddWithRetryAsync(int x, int y, - ::std::function response, + amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadAddAsync(int x, int y, - ::std::function response, + amdBadAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdNotExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdNotExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdNotExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdNotExistAddAsync(int x, int y, - ::std::function response, + amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadSystemAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadSystemAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadSystemAddAsync(int x, int y, - ::std::function response, + amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -340,52 +340,52 @@ class INTERCEPTOR_TEST_API MyObject : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual int add(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_add(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int addWithRetry(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_addWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int notExistAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_notExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badSystemAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badSystemAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddWithRetryAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAddWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdNotExistAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdNotExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadSystemAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadSystemAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/location/Test.cpp b/slice2cpp/cpp/test/Ice/location/Test.cpp index 38e4725febdb..19b040f9bad7 100644 --- a/slice2cpp/cpp/test/Ice/location/Test.cpp +++ b/slice2cpp/cpp/test/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/location/Test.h b/slice2cpp/cpp/test/Ice/location/Test.h index 391ebb95092d..d80dfdf46a3a 100644 --- a/slice2cpp/cpp/test/Ice/location/Test.h +++ b/slice2cpp/cpp/test/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/cpp/test/Ice/metrics/Test.h b/slice2cpp/cpp/test/Ice/metrics/Test.h index 8ec1cb42d2fe..62b91201fe9e 100644 --- a/slice2cpp/cpp/test/Ice/metrics/Test.h +++ b/slice2cpp/cpp/test/Ice/metrics/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/cpp/test/Ice/metrics/TestAMD.h b/slice2cpp/cpp/test/Ice/metrics/TestAMD.h index 1d479033bd3b..defcbd6db996 100644 --- a/slice2cpp/cpp/test/Ice/metrics/TestAMD.h +++ b/slice2cpp/cpp/test/Ice/metrics/TestAMD.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/cpp/test/Ice/objects/Test.h b/slice2cpp/cpp/test/Ice/objects/Test.h index d02f44de0bbb..5a9d5785779c 100644 --- a/slice2cpp/cpp/test/Ice/objects/Test.h +++ b/slice2cpp/cpp/test/Ice/objects/Test.h @@ -103,7 +103,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -121,9 +121,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -922,14 +922,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1212,7 +1212,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1222,7 +1222,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1235,7 +1235,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/cpp/test/Ice/operations/Test.cpp b/slice2cpp/cpp/test/Ice/operations/Test.cpp index 9d65f884726e..23f7359ef025 100644 --- a/slice2cpp/cpp/test/Ice/operations/Test.cpp +++ b/slice2cpp/cpp/test/Ice/operations/Test.cpp @@ -466,37 +466,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -507,7 +507,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -562,39 +562,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,7 +605,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2563,30 +2563,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2724,31 +2724,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2760,31 +2760,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2796,31 +2796,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2832,31 +2832,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3644,12 +3644,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3682,15 +3682,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4485,7 +4485,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4553,10 +4553,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4570,10 +4570,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4587,10 +4587,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4604,10 +4604,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/operations/Test.h b/slice2cpp/cpp/test/Ice/operations/Test.h index 68a534019db2..73a1bff39bf6 100644 --- a/slice2cpp/cpp/test/Ice/operations/Test.h +++ b/slice2cpp/cpp/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -110,11 +110,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -138,15 +138,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -384,19 +384,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -414,19 +414,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1044,18 +1044,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1115,64 +1115,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1655,14 +1655,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1837,11 +1837,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1865,13 +1865,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2440,7 +2440,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2465,22 +2465,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/operations/TestAMD.cpp b/slice2cpp/cpp/test/Ice/operations/TestAMD.cpp index ebf253e85b16..9d8ad69c11e8 100644 --- a/slice2cpp/cpp/test/Ice/operations/TestAMD.cpp +++ b/slice2cpp/cpp/test/Ice/operations/TestAMD.cpp @@ -379,37 +379,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,7 +420,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -475,39 +475,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -518,7 +518,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2476,30 +2476,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2637,31 +2637,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2673,31 +2673,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2709,31 +2709,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2745,31 +2745,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3545,12 +3545,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret, ::Ice::Byte iceP_p3) + auto responseCB = [inA](::std::uint8_t ret, ::std::uint8_t iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p3, ret); @@ -3591,13 +3591,13 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret, short iceP_p4, int iceP_p5, long long int iceP_p6) + auto responseCB = [inA](::std::int64_t ret, ::std::int16_t iceP_p4, ::std::int32_t iceP_p5, ::std::int64_t iceP_p6) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); @@ -4550,7 +4550,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4627,11 +4627,11 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret) + auto responseCB = [inA](::std::uint8_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4649,11 +4649,11 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](short ret) + auto responseCB = [inA](::std::int16_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4671,11 +4671,11 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4693,11 +4693,11 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret) + auto responseCB = [inA](::std::int64_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/cpp/test/Ice/operations/TestAMD.h b/slice2cpp/cpp/test/Ice/operations/TestAMD.h index 5e0d36da4845..ae70a621528b 100644 --- a/slice2cpp/cpp/test/Ice/operations/TestAMD.h +++ b/slice2cpp/cpp/test/Ice/operations/TestAMD.h @@ -56,15 +56,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -100,11 +100,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -128,15 +128,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -365,19 +365,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -395,19 +395,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1025,18 +1025,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1096,64 +1096,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1566,14 +1566,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1713,11 +1713,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual void opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1741,13 +1741,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual void opShortIntLongAsync(short p1, int p2, long long int p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2316,7 +2316,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2341,22 +2341,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByte1Async(::Ice::Byte opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByte1Async(::std::uint8_t opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opShort1Async(short opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShort1Async(::std::int16_t opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opInt1Async(int opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opInt1Async(::std::int32_t opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opLong1Async(long long int opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLong1Async(::std::int64_t opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/optional/Test.cpp b/slice2cpp/cpp/test/Ice/optional/Test.cpp index 5d5b3cf90b7f..3c14e32d1771 100644 --- a/slice2cpp/cpp/test/Ice/optional/Test.cpp +++ b/slice2cpp/cpp/test/Ice/optional/Test.cpp @@ -322,19 +322,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -345,7 +345,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -371,19 +371,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -394,7 +394,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,19 +420,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -443,7 +443,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -468,37 +468,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -509,7 +509,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -564,37 +564,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,44 +605,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -653,44 +653,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -701,7 +701,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1214,7 +1214,7 @@ Test::InitialPrx::_iceI_opMyInterfaceProxy(const ::std::shared_ptr<::IceInternal /// \endcond std::optional<::Test::ByteSeq> -Test::InitialPrx::opByteSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opByteSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opByteSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1222,14 +1222,14 @@ Test::InitialPrx::opByteSeq(const std::optional<::std::pair, std::optional<::Test::ByteSeq>>> -Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1241,8 +1241,8 @@ Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1268,7 +1268,7 @@ Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByteSeq_name); outAsync->invoke(iceC_Test_Initial_opByteSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1360,7 +1360,7 @@ Test::InitialPrx::_iceI_opBoolSeq(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond std::optional<::Test::ShortSeq> -Test::InitialPrx::opShortSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opShortSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShortSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1368,14 +1368,14 @@ Test::InitialPrx::opShortSeq(const std::optional<::std::pair, std::optional<::Test::ShortSeq>>> -Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1387,8 +1387,8 @@ Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1414,7 +1414,7 @@ Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShortSeq_name); outAsync->invoke(iceC_Test_Initial_opShortSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1433,7 +1433,7 @@ Test::InitialPrx::_iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::Outgoi /// \endcond std::optional<::Test::IntSeq> -Test::InitialPrx::opIntSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opIntSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opIntSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1441,14 +1441,14 @@ Test::InitialPrx::opIntSeq(const std::optional<::std::pair, std::optional<::Test::IntSeq>>> -Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1460,8 +1460,8 @@ Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1487,7 +1487,7 @@ Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opIntSeq_name); outAsync->invoke(iceC_Test_Initial_opIntSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1506,7 +1506,7 @@ Test::InitialPrx::_iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond std::optional<::Test::LongSeq> -Test::InitialPrx::opLongSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opLongSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLongSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1514,14 +1514,14 @@ Test::InitialPrx::opLongSeq(const std::optional<::std::pair, std::optional<::Test::LongSeq>>> -Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1533,8 +1533,8 @@ Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1560,7 +1560,7 @@ Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLongSeq_name); outAsync->invoke(iceC_Test_Initial_opLongSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3429,7 +3429,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3446,7 +3446,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3463,7 +3463,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3480,11 +3480,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3516,11 +3516,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3534,11 +3534,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3552,11 +3552,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); @@ -3750,7 +3750,7 @@ Test::Initial::_iceD_opByteSeq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; @@ -3786,7 +3786,7 @@ Test::Initial::_iceD_opShortSeq(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; @@ -3804,7 +3804,7 @@ Test::Initial::_iceD_opIntSeq(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; @@ -3822,7 +3822,7 @@ Test::Initial::_iceD_opLongSeq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; diff --git a/slice2cpp/cpp/test/Ice/optional/Test.h b/slice2cpp/cpp/test/Ice/optional/Test.h index 47171ffd836a..b877064c5b2d 100644 --- a/slice2cpp/cpp/test/Ice/optional/Test.h +++ b/slice2cpp/cpp/test/Ice/optional/Test.h @@ -68,15 +68,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -100,21 +100,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using IntStringDict = Test::CustomMap; @@ -224,64 +224,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -299,49 +299,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -494,19 +494,19 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opMyInterfaceProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>, std::optional<::std::optional>>>>&, const std::optional<::std::optional>&, const ::Ice::Context&) const; /// \endcond - std::optional opByteSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opByteSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opByteSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opByteSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opByteSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond std::optional opBoolSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -524,49 +524,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBoolSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opShortSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opShortSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opShortSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opShortSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opIntSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opIntSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opIntSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opIntSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opLongSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opLongSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opLongSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opLongSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond std::optional opFloatSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1079,13 +1079,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1093,13 +1093,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1121,13 +1121,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1161,7 +1161,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1170,7 +1170,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1181,7 +1181,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1204,7 +1204,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1242,7 +1242,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1253,11 +1253,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1301,7 +1301,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1313,7 +1313,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1324,10 +1324,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA = 0; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA = 0; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1346,7 +1346,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1357,7 +1357,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1381,8 +1381,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB = 0; - std::optional md; + ::std::int32_t requiredB = 0; + std::optional<::std::int32_t> md; protected: @@ -1407,7 +1407,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1418,7 +1418,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1449,7 +1449,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1459,7 +1459,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1470,7 +1470,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1664,7 +1664,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1673,7 +1673,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1684,7 +1684,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1789,7 +1789,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1801,7 +1801,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1813,7 +1813,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1835,7 +1835,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1848,7 +1848,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1878,7 +1878,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1889,7 +1889,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2014,17 +2014,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2034,11 +2034,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2062,11 +2062,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2076,11 +2076,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2090,11 +2090,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2248,7 +2248,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opByteSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opByteSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2276,7 +2276,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opShortSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opShortSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2290,7 +2290,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opIntSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opIntSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIntSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2304,7 +2304,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opLongSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opLongSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLongSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/optional/TestAMD.cpp b/slice2cpp/cpp/test/Ice/optional/TestAMD.cpp index ea3f4ab18c27..4efc29adb2fe 100644 --- a/slice2cpp/cpp/test/Ice/optional/TestAMD.cpp +++ b/slice2cpp/cpp/test/Ice/optional/TestAMD.cpp @@ -322,19 +322,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -345,7 +345,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -371,19 +371,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -394,7 +394,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,19 +420,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -443,7 +443,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -468,37 +468,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -509,7 +509,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -564,37 +564,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,44 +605,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -653,44 +653,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -701,7 +701,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1214,7 +1214,7 @@ Test::InitialPrx::_iceI_opMyInterfaceProxy(const ::std::shared_ptr<::IceInternal /// \endcond std::optional<::Test::ByteSeq> -Test::InitialPrx::opByteSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opByteSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opByteSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1222,14 +1222,14 @@ Test::InitialPrx::opByteSeq(const std::optional<::std::pair, std::optional<::Test::ByteSeq>>> -Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1241,8 +1241,8 @@ Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1268,7 +1268,7 @@ Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByteSeq_name); outAsync->invoke(iceC_Test_Initial_opByteSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1360,7 +1360,7 @@ Test::InitialPrx::_iceI_opBoolSeq(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond std::optional<::Test::ShortSeq> -Test::InitialPrx::opShortSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opShortSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShortSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1368,14 +1368,14 @@ Test::InitialPrx::opShortSeq(const std::optional<::std::pair, std::optional<::Test::ShortSeq>>> -Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1387,8 +1387,8 @@ Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1414,7 +1414,7 @@ Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShortSeq_name); outAsync->invoke(iceC_Test_Initial_opShortSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1433,7 +1433,7 @@ Test::InitialPrx::_iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::Outgoi /// \endcond std::optional<::Test::IntSeq> -Test::InitialPrx::opIntSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opIntSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opIntSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1441,14 +1441,14 @@ Test::InitialPrx::opIntSeq(const std::optional<::std::pair, std::optional<::Test::IntSeq>>> -Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1460,8 +1460,8 @@ Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1487,7 +1487,7 @@ Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opIntSeq_name); outAsync->invoke(iceC_Test_Initial_opIntSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1506,7 +1506,7 @@ Test::InitialPrx::_iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond std::optional<::Test::LongSeq> -Test::InitialPrx::opLongSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opLongSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLongSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1514,14 +1514,14 @@ Test::InitialPrx::opLongSeq(const std::optional<::std::pair, std::optional<::Test::LongSeq>>> -Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1533,8 +1533,8 @@ Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1560,7 +1560,7 @@ Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLongSeq_name); outAsync->invoke(iceC_Test_Initial_opLongSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3429,7 +3429,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3446,7 +3446,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3463,7 +3463,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3480,11 +3480,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::Ice::Byte>& ret, const std::optional<::Ice::Byte>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::uint8_t>& ret, const std::optional<::std::uint8_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3524,11 +3524,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int16_t>& ret, const std::optional<::std::int16_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3546,11 +3546,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int32_t>& ret, const std::optional<::std::int32_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3568,11 +3568,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int64_t>& ret, const std::optional<::std::int64_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); @@ -3810,11 +3810,11 @@ Test::Initial::_iceD_opByteSeq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3854,11 +3854,11 @@ Test::Initial::_iceD_opShortSeq(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3876,11 +3876,11 @@ Test::Initial::_iceD_opIntSeq(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3898,11 +3898,11 @@ Test::Initial::_iceD_opLongSeq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::pair>& ret, const std::optional<::std::pair>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); diff --git a/slice2cpp/cpp/test/Ice/optional/TestAMD.h b/slice2cpp/cpp/test/Ice/optional/TestAMD.h index 7885ff9fdb02..dff6ca609d37 100644 --- a/slice2cpp/cpp/test/Ice/optional/TestAMD.h +++ b/slice2cpp/cpp/test/Ice/optional/TestAMD.h @@ -68,15 +68,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -100,21 +100,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using IntStringDict = Test::CustomMap; @@ -224,64 +224,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -299,49 +299,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -494,19 +494,19 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opMyInterfaceProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>, std::optional<::std::optional>>>>&, const std::optional<::std::optional>&, const ::Ice::Context&) const; /// \endcond - std::optional opByteSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opByteSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opByteSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opByteSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opByteSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond std::optional opBoolSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -524,49 +524,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBoolSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opShortSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opShortSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opShortSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opShortSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opIntSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opIntSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opIntSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opIntSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opLongSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opLongSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opLongSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opLongSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond std::optional opFloatSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1079,13 +1079,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1093,13 +1093,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1121,13 +1121,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1161,7 +1161,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1170,7 +1170,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1181,7 +1181,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1204,7 +1204,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1242,7 +1242,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1253,11 +1253,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1301,7 +1301,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1313,7 +1313,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1324,10 +1324,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA = 0; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA = 0; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1346,7 +1346,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1357,7 +1357,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1381,8 +1381,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB = 0; - std::optional md; + ::std::int32_t requiredB = 0; + std::optional<::std::int32_t> md; protected: @@ -1407,7 +1407,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1418,7 +1418,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1449,7 +1449,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1459,7 +1459,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1470,7 +1470,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1664,7 +1664,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1673,7 +1673,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1684,7 +1684,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1789,7 +1789,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1801,7 +1801,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1813,7 +1813,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1835,7 +1835,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1848,7 +1848,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1878,7 +1878,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1889,7 +1889,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2001,17 +2001,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opOptionalExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opDerivedExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opRequiredExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2021,11 +2021,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual void opByteAsync(std::optional<::Ice::Byte> p1, ::std::function& returnValue, const std::optional<::Ice::Byte>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(std::optional<::std::uint8_t> p1, ::std::function& returnValue, const std::optional<::std::uint8_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2049,11 +2049,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual void opShortAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortAsync(std::optional<::std::int16_t> p1, ::std::function& returnValue, const std::optional<::std::int16_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2063,11 +2063,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual void opIntAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opIntAsync(std::optional<::std::int32_t> p1, ::std::function& returnValue, const std::optional<::std::int32_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2077,11 +2077,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual void opLongAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLongAsync(std::optional<::std::int64_t> p1, ::std::function& returnValue, const std::optional<::std::int64_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2235,7 +2235,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual void opByteSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2263,7 +2263,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual void opShortSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2277,7 +2277,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual void opIntSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opIntSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIntSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2291,7 +2291,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual void opLongSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLongSeqAsync(std::optional<::std::pair> p1, ::std::function>& returnValue, const std::optional<::std::pair>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLongSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/retry/Test.cpp b/slice2cpp/cpp/test/Ice/retry/Test.cpp index ee86b069d353..861ae2bfa6b8 100644 --- a/slice2cpp/cpp/test/Ice/retry/Test.cpp +++ b/slice2cpp/cpp/test/Ice/retry/Test.cpp @@ -97,31 +97,31 @@ Test::RetryPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); } -::std::future -Test::RetryPrx::opIdempotentAsync(int iceP_c, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); } ::std::function -Test::RetryPrx::opIdempotentAsync(int iceP_c, - ::std::function response, +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); } /// \cond INTERNAL void -Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_c, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Retry_opIdempotent_name); outAsync->invoke(iceC_Test_Retry_opIdempotent_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -196,19 +196,19 @@ Test::RetryPrx::_iceI_opSystemException(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::RetryPrx::sleep(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleep(::std::int32_t iceP_delay, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &RetryPrx::_iceI_sleep, iceP_delay, context).get(); } ::std::future -Test::RetryPrx::sleepAsync(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_sleep, iceP_delay, context); } ::std::function -Test::RetryPrx::sleepAsync(int iceP_delay, +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, ::std::function response, ::std::function ex, ::std::function sent, @@ -219,7 +219,7 @@ Test::RetryPrx::sleepAsync(int iceP_delay, /// \cond INTERNAL void -Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Retry_sleep_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -313,10 +313,10 @@ Test::Retry::_iceD_opIdempotent(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_c; + ::std::int32_t iceP_c; istr->readAll(iceP_c); inS.endReadParams(); - int ret = this->opIdempotent(iceP_c, current); + ::std::int32_t ret = this->opIdempotent(iceP_c, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -354,7 +354,7 @@ Test::Retry::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& cur { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_delay; + ::std::int32_t iceP_delay; istr->readAll(iceP_delay); inS.endReadParams(); this->sleep(iceP_delay, current); diff --git a/slice2cpp/cpp/test/Ice/retry/Test.h b/slice2cpp/cpp/test/Ice/retry/Test.h index 5c5ba2348735..e76f1fbe7a00 100644 --- a/slice2cpp/cpp/test/Ice/retry/Test.h +++ b/slice2cpp/cpp/test/Ice/retry/Test.h @@ -63,19 +63,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - int opIdempotent(int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIdempotentAsync(int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIdempotentAsync(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIdempotentAsync(int c, - ::std::function response, + opIdempotentAsync(::std::int32_t c, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opNotIdempotent(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -106,19 +106,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_opSystemException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int delay, + sleepAsync(::std::int32_t delay, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -227,7 +227,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opIdempotent(int c, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -242,7 +242,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_opSystemException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int delay, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/scope/Test.h b/slice2cpp/cpp/test/Ice/scope/Test.h index 06b58770c6e3..d4596c711107 100644 --- a/slice2cpp/cpp/test/Ice/scope/Test.h +++ b/slice2cpp/cpp/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/cpp/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/cpp/test/Ice/slicing/objects/ClientPrivate.h index e09124ade434..3d94a6123b1b 100644 --- a/slice2cpp/cpp/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/cpp/test/Ice/slicing/objects/ClientPrivate.h @@ -104,7 +104,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -114,7 +114,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -163,7 +163,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -173,7 +173,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -203,7 +203,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -213,7 +213,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -224,7 +224,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -243,7 +243,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -253,7 +253,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -283,7 +283,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -293,7 +293,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivate.h b/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivate.h index ac8f7ad46561..ace8c39a13ee 100644 --- a/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivate.h +++ b/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivate.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivateAMD.h b/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivateAMD.h index 6a250c9a6162..0ebb7ec63611 100644 --- a/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivateAMD.h +++ b/slice2cpp/cpp/test/Ice/slicing/objects/ServerPrivateAMD.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/cpp/test/Ice/slicing/objects/Test.h b/slice2cpp/cpp/test/Ice/slicing/objects/Test.h index 83914be23c07..55cff72d32e4 100644 --- a/slice2cpp/cpp/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/cpp/test/Ice/slicing/objects/Test.h @@ -55,7 +55,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -952,7 +952,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -961,7 +961,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -972,7 +972,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -991,7 +991,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1001,7 +1001,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1050,7 +1050,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1060,7 +1060,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1090,7 +1090,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1100,7 +1100,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/cpp/test/Ice/slicing/objects/TestAMD.h b/slice2cpp/cpp/test/Ice/slicing/objects/TestAMD.h index 1f218d17bb88..319dd6bf401a 100644 --- a/slice2cpp/cpp/test/Ice/slicing/objects/TestAMD.h +++ b/slice2cpp/cpp/test/Ice/slicing/objects/TestAMD.h @@ -54,7 +54,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -951,7 +951,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -960,7 +960,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -971,7 +971,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -990,7 +990,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1000,7 +1000,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1049,7 +1049,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1059,7 +1059,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/cpp/test/Ice/stream/Test.h b/slice2cpp/cpp/test/Ice/stream/Test.h index debc9f91ee1c..c284c671a4f9 100644 --- a/slice2cpp/cpp/test/Ice/stream/Test.h +++ b/slice2cpp/cpp/test/Ice/stream/Test.h @@ -101,11 +101,11 @@ using SmallStructSS = ::std::vector; using MyClassSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -205,10 +205,10 @@ namespace Test struct SmallStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -219,7 +219,7 @@ struct SmallStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, p); } @@ -227,13 +227,13 @@ struct SmallStruct struct ClassStruct { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -245,10 +245,10 @@ namespace Sub struct NestedStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -258,7 +258,7 @@ struct NestedStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e); } @@ -266,13 +266,13 @@ struct NestedStruct struct NestedClassStruct { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -305,10 +305,10 @@ namespace Sub2 struct NestedStruct2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -318,7 +318,7 @@ struct NestedStruct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e); } @@ -326,13 +326,13 @@ struct NestedStruct2 struct NestedClassStruct2 { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -375,7 +375,7 @@ class OptionalClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - OptionalClass(bool bo, ::Ice::Byte by, const std::optional& sh, const std::optional& i) : + OptionalClass(bool bo, ::std::uint8_t by, const std::optional<::std::int16_t>& sh, const std::optional<::std::int32_t>& i) : bo(bo), by(by), sh(sh), @@ -387,7 +387,7 @@ class OptionalClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(bo, by, sh, i); } @@ -399,9 +399,9 @@ class OptionalClass : public ::Ice::ValueHelper static const ::std::string& ice_staticId(); bool bo; - ::Ice::Byte by; - std::optional sh; - std::optional i; + ::std::uint8_t by; + std::optional<::std::int16_t> sh; + std::optional<::std::int32_t> i; }; /// \cond INTERNAL diff --git a/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.cpp b/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.cpp index 778f5f92442a..92dd129cb393 100644 --- a/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.cpp +++ b/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.cpp @@ -85,30 +85,30 @@ Test::PriorityPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -int +::std::int32_t Test::PriorityPrx::getPriority(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &PriorityPrx::_iceI_getPriority, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &PriorityPrx::_iceI_getPriority, context).get(); } -::std::future +::std::future<::std::int32_t> Test::PriorityPrx::getPriorityAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &PriorityPrx::_iceI_getPriority, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &PriorityPrx::_iceI_getPriority, context); } ::std::function -Test::PriorityPrx::getPriorityAsync(::std::function response, +Test::PriorityPrx::getPriorityAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::PriorityPrx::_iceI_getPriority, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::PriorityPrx::_iceI_getPriority, context); } /// \cond INTERNAL void -Test::PriorityPrx::_iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::PriorityPrx::_iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Priority_getPriority_name); outAsync->invoke(iceC_Test_Priority_getPriority_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -166,7 +166,7 @@ Test::Priority::_iceD_getPriority(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getPriority(current); + ::std::int32_t ret = this->getPriority(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.h b/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.h index e6436cf56f4f..69ee10c8b212 100644 --- a/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.h +++ b/slice2cpp/cpp/test/Ice/threadPoolPriority/Test.h @@ -62,18 +62,18 @@ class PriorityPrx : public ::Ice::Proxy void _iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getPriority(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getPriority(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getPriorityAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getPriorityAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getPriorityAsync(::std::function response, + getPriorityAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -168,7 +168,7 @@ class Priority : public virtual ::Ice::Object bool _iceD_shutdown(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getPriority(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getPriority(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getPriority(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/timeout/Test.cpp b/slice2cpp/cpp/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/cpp/test/Ice/timeout/Test.cpp +++ b/slice2cpp/cpp/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/cpp/test/Ice/timeout/Test.h b/slice2cpp/cpp/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/cpp/test/Ice/timeout/Test.h +++ b/slice2cpp/cpp/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/Ice/udp/Test.h b/slice2cpp/cpp/test/Ice/udp/Test.h index 0dc1af098509..2a27862383e0 100644 --- a/slice2cpp/cpp/test/Ice/udp/Test.h +++ b/slice2cpp/cpp/test/Ice/udp/Test.h @@ -44,7 +44,7 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/cpp/test/IceBridge/simple/Test.cpp b/slice2cpp/cpp/test/IceBridge/simple/Test.cpp index 22c3e1cef934..c5dd5324f192 100644 --- a/slice2cpp/cpp/test/IceBridge/simple/Test.cpp +++ b/slice2cpp/cpp/test/IceBridge/simple/Test.cpp @@ -130,30 +130,30 @@ Test::CallbackPrx::_iceI_ping(const ::std::shared_ptr<::IceInternal::OutgoingAsy } /// \endcond -int +::std::int32_t Test::CallbackPrx::getCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &CallbackPrx::_iceI_getCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &CallbackPrx::_iceI_getCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::CallbackPrx::getCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &CallbackPrx::_iceI_getCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &CallbackPrx::_iceI_getCount, context); } ::std::function -Test::CallbackPrx::getCountAsync(::std::function response, +Test::CallbackPrx::getCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackPrx::_iceI_getCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackPrx::_iceI_getCount, context); } /// \cond INTERNAL void -Test::CallbackPrx::_iceI_getCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::CallbackPrx::_iceI_getCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Callback_getCount_name); outAsync->invoke(iceC_Test_Callback_getCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -193,30 +193,30 @@ Test::CallbackPrx::_iceI_datagram(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -int +::std::int32_t Test::CallbackPrx::getDatagramCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &CallbackPrx::_iceI_getDatagramCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &CallbackPrx::_iceI_getDatagramCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::CallbackPrx::getDatagramCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &CallbackPrx::_iceI_getDatagramCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &CallbackPrx::_iceI_getDatagramCount, context); } ::std::function -Test::CallbackPrx::getDatagramCountAsync(::std::function response, +Test::CallbackPrx::getDatagramCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackPrx::_iceI_getDatagramCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::CallbackPrx::_iceI_getDatagramCount, context); } /// \cond INTERNAL void -Test::CallbackPrx::_iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::CallbackPrx::_iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Callback_getDatagramCount_name); outAsync->invoke(iceC_Test_Callback_getDatagramCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -262,30 +262,30 @@ Test::MyClassPrx::_iceI_callCallback(const ::std::shared_ptr<::IceInternal::Outg } /// \endcond -int +::std::int32_t Test::MyClassPrx::getCallbackCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_getCallbackCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_getCallbackCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::getCallbackCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_getCallbackCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_getCallbackCount, context); } ::std::function -Test::MyClassPrx::getCallbackCountAsync(::std::function response, +Test::MyClassPrx::getCallbackCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getCallbackCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getCallbackCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_getCallbackCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_getCallbackCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_getCallbackCount_name); outAsync->invoke(iceC_Test_MyClass_getCallbackCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -295,19 +295,19 @@ Test::MyClassPrx::_iceI_getCallbackCount(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::MyClassPrx::incCounter(int iceP_expected, const ::Ice::Context& context) const +Test::MyClassPrx::incCounter(::std::int32_t iceP_expected, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_incCounter, iceP_expected, context).get(); } ::std::future -Test::MyClassPrx::incCounterAsync(int iceP_expected, const ::Ice::Context& context) const +Test::MyClassPrx::incCounterAsync(::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_incCounter, iceP_expected, context); } ::std::function -Test::MyClassPrx::incCounterAsync(int iceP_expected, +Test::MyClassPrx::incCounterAsync(::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -318,7 +318,7 @@ Test::MyClassPrx::incCounterAsync(int iceP_expected, /// \cond INTERNAL void -Test::MyClassPrx::_iceI_incCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_expected, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_incCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_MyClass_incCounter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -330,19 +330,19 @@ Test::MyClassPrx::_iceI_incCounter(const ::std::shared_ptr<::IceInternal::Outgoi /// \endcond void -Test::MyClassPrx::waitCounter(int iceP_value, const ::Ice::Context& context) const +Test::MyClassPrx::waitCounter(::std::int32_t iceP_value, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_waitCounter, iceP_value, context).get(); } ::std::future -Test::MyClassPrx::waitCounterAsync(int iceP_value, const ::Ice::Context& context) const +Test::MyClassPrx::waitCounterAsync(::std::int32_t iceP_value, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_waitCounter, iceP_value, context); } ::std::function -Test::MyClassPrx::waitCounterAsync(int iceP_value, +Test::MyClassPrx::waitCounterAsync(::std::int32_t iceP_value, ::std::function response, ::std::function ex, ::std::function sent, @@ -353,7 +353,7 @@ Test::MyClassPrx::waitCounterAsync(int iceP_value, /// \cond INTERNAL void -Test::MyClassPrx::_iceI_waitCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_waitCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_MyClass_waitCounter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -364,30 +364,30 @@ Test::MyClassPrx::_iceI_waitCounter(const ::std::shared_ptr<::IceInternal::Outgo } /// \endcond -int +::std::int32_t Test::MyClassPrx::getConnectionCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_getConnectionCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_getConnectionCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::getConnectionCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_getConnectionCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_getConnectionCount, context); } ::std::function -Test::MyClassPrx::getConnectionCountAsync(::std::function response, +Test::MyClassPrx::getConnectionCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getConnectionCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getConnectionCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_getConnectionCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_getConnectionCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_getConnectionCount_name); outAsync->invoke(iceC_Test_MyClass_getConnectionCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -494,30 +494,30 @@ Test::MyClassPrx::_iceI_datagram(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::MyClassPrx::getDatagramCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_getDatagramCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_getDatagramCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::getDatagramCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_getDatagramCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_getDatagramCount, context); } ::std::function -Test::MyClassPrx::getDatagramCountAsync(::std::function response, +Test::MyClassPrx::getDatagramCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getDatagramCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getDatagramCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_getDatagramCount_name); outAsync->invoke(iceC_Test_MyClass_getDatagramCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -557,30 +557,30 @@ Test::MyClassPrx::_iceI_callDatagramCallback(const ::std::shared_ptr<::IceIntern } /// \endcond -int +::std::int32_t Test::MyClassPrx::getCallbackDatagramCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_getCallbackDatagramCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_getCallbackDatagramCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::getCallbackDatagramCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_getCallbackDatagramCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_getCallbackDatagramCount, context); } ::std::function -Test::MyClassPrx::getCallbackDatagramCountAsync(::std::function response, +Test::MyClassPrx::getCallbackDatagramCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getCallbackDatagramCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getCallbackDatagramCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_getCallbackDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_getCallbackDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_getCallbackDatagramCount_name); outAsync->invoke(iceC_Test_MyClass_getCallbackDatagramCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -589,30 +589,30 @@ Test::MyClassPrx::_iceI_getCallbackDatagramCount(const ::std::shared_ptr<::IceIn } /// \endcond -int +::std::int32_t Test::MyClassPrx::getHeartbeatCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_getHeartbeatCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_getHeartbeatCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::getHeartbeatCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_getHeartbeatCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_getHeartbeatCount, context); } ::std::function -Test::MyClassPrx::getHeartbeatCountAsync(::std::function response, +Test::MyClassPrx::getHeartbeatCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getHeartbeatCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_getHeartbeatCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_getHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_getHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_getHeartbeatCount_name); outAsync->invoke(iceC_Test_MyClass_getHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -732,7 +732,7 @@ Test::Callback::_iceD_getCount(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getCount(current); + ::std::int32_t ret = this->getCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -758,7 +758,7 @@ Test::Callback::_iceD_getDatagramCount(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getDatagramCount(current); + ::std::int32_t ret = this->getDatagramCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -863,7 +863,7 @@ Test::MyClass::_iceD_getCallbackCount(::IceInternal::Incoming& inS, const ::Ice: _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -881,7 +881,7 @@ Test::MyClass::_iceD_incCounter(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_expected; + ::std::int32_t iceP_expected; istr->readAll(iceP_expected); inS.endReadParams(); this->incCounter(iceP_expected, current); @@ -896,7 +896,7 @@ Test::MyClass::_iceD_waitCounter(::IceInternal::Incoming& inS, const ::Ice::Curr { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; + ::std::int32_t iceP_value; istr->readAll(iceP_value); inS.endReadParams(); this->waitCounter(iceP_value, current); @@ -911,7 +911,7 @@ Test::MyClass::_iceD_getConnectionCount(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getConnectionCount(current); + ::std::int32_t ret = this->getConnectionCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -966,7 +966,7 @@ Test::MyClass::_iceD_getDatagramCount(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getDatagramCount(current); + ::std::int32_t ret = this->getDatagramCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -993,7 +993,7 @@ Test::MyClass::_iceD_getCallbackDatagramCount(::IceInternal::Incoming& inS, cons _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -1011,7 +1011,7 @@ Test::MyClass::_iceD_getHeartbeatCount(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getHeartbeatCount(current); + ::std::int32_t ret = this->getHeartbeatCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/cpp/test/IceBridge/simple/Test.h b/slice2cpp/cpp/test/IceBridge/simple/Test.h index 531492e9dc44..9c4c8ad246f9 100644 --- a/slice2cpp/cpp/test/IceBridge/simple/Test.h +++ b/slice2cpp/cpp/test/IceBridge/simple/Test.h @@ -66,18 +66,18 @@ class CallbackPrx : public ::Ice::Proxy void _iceI_ping(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getCountAsync(::std::function response, + getCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void datagram(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -94,18 +94,18 @@ class CallbackPrx : public ::Ice::Proxy void _iceI_datagram(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getDatagramCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getDatagramCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getDatagramCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getDatagramCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getDatagramCountAsync(::std::function response, + getDatagramCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -174,62 +174,62 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_callCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getCallbackCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getCallbackCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getCallbackCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getCallbackCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getCallbackCountAsync(::std::function response, + getCallbackCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getCallbackCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getCallbackCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - void incCounter(int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void incCounter(::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future incCounterAsync(int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future incCounterAsync(::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - incCounterAsync(int expected, + incCounterAsync(::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_incCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_incCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void waitCounter(int value, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitCounter(::std::int32_t value, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitCounterAsync(int value, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitCounterAsync(::std::int32_t value, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitCounterAsync(int value, + waitCounterAsync(::std::int32_t value, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitCounter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int getConnectionCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getConnectionCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getConnectionCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getConnectionCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getConnectionCountAsync(::std::function response, + getConnectionCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getConnectionCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getConnectionCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::std::string getConnectionInfo(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -275,18 +275,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_datagram(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getDatagramCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getDatagramCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getDatagramCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getDatagramCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getDatagramCountAsync(::std::function response, + getDatagramCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void callDatagramCallback(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -303,32 +303,32 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_callDatagramCallback(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getCallbackDatagramCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getCallbackDatagramCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getCallbackDatagramCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getCallbackDatagramCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getCallbackDatagramCountAsync(::std::function response, + getCallbackDatagramCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getCallbackDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getCallbackDatagramCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - int getHeartbeatCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getHeartbeatCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getHeartbeatCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getHeartbeatCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getHeartbeatCountAsync(::std::function response, + getHeartbeatCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void enableHeartbeats(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -451,7 +451,7 @@ class Callback : public virtual ::Ice::Object bool _iceD_ping(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -461,7 +461,7 @@ class Callback : public virtual ::Ice::Object bool _iceD_datagram(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getDatagramCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getDatagramCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getDatagramCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -510,22 +510,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_callCallback(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void getCallbackCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void getCallbackCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getCallbackCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void incCounter(int expected, const ::Ice::Current& current) = 0; + virtual void incCounter(::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_incCounter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitCounter(int value, const ::Ice::Current& current) = 0; + virtual void waitCounter(::std::int32_t value, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitCounter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getConnectionCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getConnectionCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getConnectionCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -545,7 +545,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_datagram(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getDatagramCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getDatagramCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getDatagramCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -555,12 +555,12 @@ class MyClass : public virtual ::Ice::Object bool _iceD_callDatagramCallback(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void getCallbackDatagramCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void getCallbackDatagramCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getCallbackDatagramCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getHeartbeatCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getHeartbeatCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/IceStorm/rep1/Single.cpp b/slice2cpp/cpp/test/IceStorm/rep1/Single.cpp index 27476309e13d..42c75f971ae1 100644 --- a/slice2cpp/cpp/test/IceStorm/rep1/Single.cpp +++ b/slice2cpp/cpp/test/IceStorm/rep1/Single.cpp @@ -53,19 +53,19 @@ const ::std::string iceC_Test_Single_event_name = "event"; } void -Test::SinglePrx::event(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::event(::std::int32_t iceP_i, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &SinglePrx::_iceI_event, iceP_i, context).get(); } ::std::future -Test::SinglePrx::eventAsync(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &SinglePrx::_iceI_event, iceP_i, context); } ::std::function -Test::SinglePrx::eventAsync(int iceP_i, +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, ::std::function response, ::std::function ex, ::std::function sent, @@ -76,7 +76,7 @@ Test::SinglePrx::eventAsync(int iceP_i, /// \cond INTERNAL void -Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Single_event_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -124,7 +124,7 @@ Test::Single::_iceD_event(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); this->event(iceP_i, current); diff --git a/slice2cpp/cpp/test/IceStorm/rep1/Single.h b/slice2cpp/cpp/test/IceStorm/rep1/Single.h index 5d2b5f2af673..ef440a4b52c5 100644 --- a/slice2cpp/cpp/test/IceStorm/rep1/Single.h +++ b/slice2cpp/cpp/test/IceStorm/rep1/Single.h @@ -48,19 +48,19 @@ class SinglePrx : public ::Ice::Proxy { public: - void event(int i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void event(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future eventAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future eventAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - eventAsync(int i, + eventAsync(::std::int32_t i, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,7 +150,7 @@ class Single : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void event(int i, const ::Ice::Current& current) = 0; + virtual void event(::std::int32_t i, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_event(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/IceStorm/repgrid/Single.cpp b/slice2cpp/cpp/test/IceStorm/repgrid/Single.cpp index 27476309e13d..42c75f971ae1 100644 --- a/slice2cpp/cpp/test/IceStorm/repgrid/Single.cpp +++ b/slice2cpp/cpp/test/IceStorm/repgrid/Single.cpp @@ -53,19 +53,19 @@ const ::std::string iceC_Test_Single_event_name = "event"; } void -Test::SinglePrx::event(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::event(::std::int32_t iceP_i, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &SinglePrx::_iceI_event, iceP_i, context).get(); } ::std::future -Test::SinglePrx::eventAsync(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &SinglePrx::_iceI_event, iceP_i, context); } ::std::function -Test::SinglePrx::eventAsync(int iceP_i, +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, ::std::function response, ::std::function ex, ::std::function sent, @@ -76,7 +76,7 @@ Test::SinglePrx::eventAsync(int iceP_i, /// \cond INTERNAL void -Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Single_event_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -124,7 +124,7 @@ Test::Single::_iceD_event(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); this->event(iceP_i, current); diff --git a/slice2cpp/cpp/test/IceStorm/repgrid/Single.h b/slice2cpp/cpp/test/IceStorm/repgrid/Single.h index 5d2b5f2af673..ef440a4b52c5 100644 --- a/slice2cpp/cpp/test/IceStorm/repgrid/Single.h +++ b/slice2cpp/cpp/test/IceStorm/repgrid/Single.h @@ -48,19 +48,19 @@ class SinglePrx : public ::Ice::Proxy { public: - void event(int i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void event(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future eventAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future eventAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - eventAsync(int i, + eventAsync(::std::int32_t i, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,7 +150,7 @@ class Single : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void event(int i, const ::Ice::Current& current) = 0; + virtual void event(::std::int32_t i, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_event(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/IceStorm/repstress/Single.cpp b/slice2cpp/cpp/test/IceStorm/repstress/Single.cpp index 27476309e13d..42c75f971ae1 100644 --- a/slice2cpp/cpp/test/IceStorm/repstress/Single.cpp +++ b/slice2cpp/cpp/test/IceStorm/repstress/Single.cpp @@ -53,19 +53,19 @@ const ::std::string iceC_Test_Single_event_name = "event"; } void -Test::SinglePrx::event(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::event(::std::int32_t iceP_i, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &SinglePrx::_iceI_event, iceP_i, context).get(); } ::std::future -Test::SinglePrx::eventAsync(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &SinglePrx::_iceI_event, iceP_i, context); } ::std::function -Test::SinglePrx::eventAsync(int iceP_i, +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, ::std::function response, ::std::function ex, ::std::function sent, @@ -76,7 +76,7 @@ Test::SinglePrx::eventAsync(int iceP_i, /// \cond INTERNAL void -Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Single_event_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -124,7 +124,7 @@ Test::Single::_iceD_event(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); this->event(iceP_i, current); diff --git a/slice2cpp/cpp/test/IceStorm/repstress/Single.h b/slice2cpp/cpp/test/IceStorm/repstress/Single.h index 5d2b5f2af673..ef440a4b52c5 100644 --- a/slice2cpp/cpp/test/IceStorm/repstress/Single.h +++ b/slice2cpp/cpp/test/IceStorm/repstress/Single.h @@ -48,19 +48,19 @@ class SinglePrx : public ::Ice::Proxy { public: - void event(int i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void event(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future eventAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future eventAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - eventAsync(int i, + eventAsync(::std::int32_t i, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,7 +150,7 @@ class Single : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void event(int i, const ::Ice::Current& current) = 0; + virtual void event(::std::int32_t i, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_event(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/IceStorm/single/Single.cpp b/slice2cpp/cpp/test/IceStorm/single/Single.cpp index 27476309e13d..42c75f971ae1 100644 --- a/slice2cpp/cpp/test/IceStorm/single/Single.cpp +++ b/slice2cpp/cpp/test/IceStorm/single/Single.cpp @@ -53,19 +53,19 @@ const ::std::string iceC_Test_Single_event_name = "event"; } void -Test::SinglePrx::event(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::event(::std::int32_t iceP_i, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &SinglePrx::_iceI_event, iceP_i, context).get(); } ::std::future -Test::SinglePrx::eventAsync(int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &SinglePrx::_iceI_event, iceP_i, context); } ::std::function -Test::SinglePrx::eventAsync(int iceP_i, +Test::SinglePrx::eventAsync(::std::int32_t iceP_i, ::std::function response, ::std::function ex, ::std::function sent, @@ -76,7 +76,7 @@ Test::SinglePrx::eventAsync(int iceP_i, /// \cond INTERNAL void -Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::SinglePrx::_iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Single_event_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -124,7 +124,7 @@ Test::Single::_iceD_event(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); this->event(iceP_i, current); diff --git a/slice2cpp/cpp/test/IceStorm/single/Single.h b/slice2cpp/cpp/test/IceStorm/single/Single.h index 5d2b5f2af673..ef440a4b52c5 100644 --- a/slice2cpp/cpp/test/IceStorm/single/Single.h +++ b/slice2cpp/cpp/test/IceStorm/single/Single.h @@ -48,19 +48,19 @@ class SinglePrx : public ::Ice::Proxy { public: - void event(int i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void event(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future eventAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future eventAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - eventAsync(int i, + eventAsync(::std::int32_t i, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_event(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,7 +150,7 @@ class Single : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void event(int i, const ::Ice::Current& current) = 0; + virtual void event(::std::int32_t i, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_event(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/cpp/test/IceStorm/stress/Event.cpp b/slice2cpp/cpp/test/IceStorm/stress/Event.cpp index 2108d8e79b75..9a723f4593ab 100644 --- a/slice2cpp/cpp/test/IceStorm/stress/Event.cpp +++ b/slice2cpp/cpp/test/IceStorm/stress/Event.cpp @@ -53,19 +53,19 @@ const ::std::string iceC_Test_Event_pub_name = "pub"; } void -Test::EventPrx::pub(int iceP_counter, const ::Ice::Context& context) const +Test::EventPrx::pub(::std::int32_t iceP_counter, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &EventPrx::_iceI_pub, iceP_counter, context).get(); } ::std::future -Test::EventPrx::pubAsync(int iceP_counter, const ::Ice::Context& context) const +Test::EventPrx::pubAsync(::std::int32_t iceP_counter, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &EventPrx::_iceI_pub, iceP_counter, context); } ::std::function -Test::EventPrx::pubAsync(int iceP_counter, +Test::EventPrx::pubAsync(::std::int32_t iceP_counter, ::std::function response, ::std::function ex, ::std::function sent, @@ -76,7 +76,7 @@ Test::EventPrx::pubAsync(int iceP_counter, /// \cond INTERNAL void -Test::EventPrx::_iceI_pub(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_counter, const ::Ice::Context& context) const +Test::EventPrx::_iceI_pub(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_counter, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Event_pub_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -124,7 +124,7 @@ Test::Event::_iceD_pub(::IceInternal::Incoming& inS, const ::Ice::Current& curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_counter; + ::std::int32_t iceP_counter; istr->readAll(iceP_counter); inS.endReadParams(); this->pub(iceP_counter, current); diff --git a/slice2cpp/cpp/test/IceStorm/stress/Event.h b/slice2cpp/cpp/test/IceStorm/stress/Event.h index bea5383fe1c9..d5e4f976bb1b 100644 --- a/slice2cpp/cpp/test/IceStorm/stress/Event.h +++ b/slice2cpp/cpp/test/IceStorm/stress/Event.h @@ -48,19 +48,19 @@ class EventPrx : public ::Ice::Proxy { public: - void pub(int counter, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void pub(::std::int32_t counter, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future pubAsync(int counter, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future pubAsync(::std::int32_t counter, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - pubAsync(int counter, + pubAsync(::std::int32_t counter, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_pub(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_pub(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,7 +150,7 @@ class Event : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void pub(int counter, const ::Ice::Current& current) = 0; + virtual void pub(::std::int32_t counter, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_pub(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/acm/Test.cpp b/slice2cpp/csharp/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/csharp/test/Ice/acm/Test.cpp +++ b/slice2cpp/csharp/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/csharp/test/Ice/acm/Test.h b/slice2cpp/csharp/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/csharp/test/Ice/acm/Test.h +++ b/slice2cpp/csharp/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/ami/Test.cpp b/slice2cpp/csharp/test/Ice/ami/Test.cpp index 04c0af3a382c..059846440871 100644 --- a/slice2cpp/csharp/test/Ice/ami/Test.cpp +++ b/slice2cpp/csharp/test/Ice/ami/Test.cpp @@ -238,30 +238,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -346,30 +346,30 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -379,19 +379,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -402,7 +402,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -450,19 +450,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -473,7 +473,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -672,30 +672,30 @@ Test::TestIntfPrx::_iceI_opAsyncDispatch(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResultAsyncDispatch(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResultAsyncDispatch, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResultAsyncDispatch, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsyncDispatchAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResultAsyncDispatch, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResultAsyncDispatch, context); } ::std::function -Test::TestIntfPrx::opWithResultAsyncDispatchAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsyncDispatchAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResultAsyncDispatch, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResultAsyncDispatch, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResultAsyncDispatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResultAsyncDispatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResultAsyncDispatch_name); outAsync->invoke(iceC_Test_TestIntf_opWithResultAsyncDispatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -858,37 +858,37 @@ Test::TestIntfControllerPrx::ice_staticId() return TestIntfController::ice_staticId(); } -int -Test::Outer::Inner::TestIntfPrx::op(int iceP_i, int& iceP_j, const ::Ice::Context& context) const +::std::int32_t +Test::Outer::Inner::TestIntfPrx::op(::std::int32_t iceP_i, ::std::int32_t& iceP_j, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); iceP_j = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); } ::std::function -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, - ::std::function response, +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); } /// \cond INTERNAL void -Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Outer_Inner_TestIntf_op_name); outAsync->invoke(iceC_Test_Outer_Inner_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -899,7 +899,7 @@ Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal: nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1059,7 +1059,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1097,7 +1097,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1111,7 +1111,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -1143,7 +1143,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -1235,7 +1235,7 @@ Test::TestIntf::_iceD_opWithResultAsyncDispatch(::IceInternal::Incoming& inS, co _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -1508,11 +1508,11 @@ Test::Outer::Inner::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int iceP_j; - int ret = this->op(iceP_i, iceP_j, current); + ::std::int32_t iceP_j; + ::std::int32_t ret = this->op(iceP_i, iceP_j, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_j, ret); inS.endWriteParams(); diff --git a/slice2cpp/csharp/test/Ice/ami/Test.h b/slice2cpp/csharp/test/Ice/ami/Test.h index 86d8d45f7d58..24e91ddee75c 100644 --- a/slice2cpp/csharp/test/Ice/ami/Test.h +++ b/slice2cpp/csharp/test/Ice/ami/Test.h @@ -186,18 +186,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -228,33 +228,33 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -272,19 +272,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -371,18 +371,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opAsyncDispatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opWithResultAsyncDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResultAsyncDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsyncDispatchAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsyncDispatchAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsyncDispatchAsync(::std::function response, + opWithResultAsyncDispatchAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResultAsyncDispatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResultAsyncDispatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUEAsyncDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -552,19 +552,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(int i, int& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> opAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(int i, - ::std::function response, + opAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -747,7 +747,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -762,12 +762,12 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -777,7 +777,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -812,7 +812,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opAsyncDispatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opWithResultAsyncDispatchAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opWithResultAsyncDispatchAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResultAsyncDispatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -926,11 +926,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpResult { - int returnValue; - int j; + ::std::int32_t returnValue; + ::std::int32_t j; }; - virtual int op(int i, int& j, const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/defaultValue/Test.h b/slice2cpp/csharp/test/Ice/defaultValue/Test.h index 23c0e33deae1..a71ce146e28b 100644 --- a/slice2cpp/csharp/test/Ice/defaultValue/Test.h +++ b/slice2cpp/csharp/test/Ice/defaultValue/Test.h @@ -75,13 +75,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -101,9 +101,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -113,11 +113,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -128,10 +128,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -142,8 +142,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -153,7 +153,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -162,10 +162,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -175,8 +175,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -186,7 +186,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -196,10 +196,10 @@ struct Struct3 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::Test::Color c1 = ::Test::Color::red; @@ -208,8 +208,8 @@ struct Struct3 ::Test::Nested::Color nc1 = ::Test::Nested::Color::red; ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -219,7 +219,7 @@ struct Struct3 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -229,10 +229,10 @@ struct Struct4 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::Test::Color c1 = ::Test::Color::red; @@ -241,8 +241,8 @@ struct Struct4 ::Test::Nested::Color nc1 = ::Test::Nested::Color::red; ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -252,7 +252,7 @@ struct Struct4 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -262,16 +262,16 @@ struct StructProperty { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo bar"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -281,7 +281,7 @@ struct StructProperty * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -289,13 +289,13 @@ struct StructProperty struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -318,10 +318,10 @@ struct InnerStruct2 struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -336,7 +336,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, iseq, st, st2, dict); } @@ -370,7 +370,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -394,7 +394,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -407,16 +407,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -443,7 +443,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -458,7 +458,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -493,7 +493,7 @@ class ClassProperty : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - ClassProperty(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + ClassProperty(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -517,7 +517,7 @@ class ClassProperty : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -530,16 +530,16 @@ class ClassProperty : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo bar"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -651,7 +651,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -675,7 +675,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -688,16 +688,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -721,7 +721,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -736,7 +736,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -768,7 +768,7 @@ class ExceptionProperty : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -805,16 +805,16 @@ class ExceptionProperty : public ::Ice::UserExceptionHelper; namespace Test { -using NV = ::std::map; +using NV = ::std::map<::std::int32_t, ::std::int32_t>; using NR = ::std::map<::std::string, ::std::string>; @@ -48,11 +48,11 @@ using NDV = ::std::map<::std::string, NV>; using NDR = ::std::map<::std::string, NR>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using AIS = ::std::vector; +using AIS = ::std::vector<::std::int32_t>; -using GIS = ::std::vector; +using GIS = ::std::vector<::std::int32_t>; using ASS = ::std::vector<::std::string>; diff --git a/slice2cpp/csharp/test/Ice/dictMapping/TestAMD.h b/slice2cpp/csharp/test/Ice/dictMapping/TestAMD.h index 6cc535e033bc..ceeefbdd87ad 100644 --- a/slice2cpp/csharp/test/Ice/dictMapping/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/dictMapping/TestAMD.h @@ -39,7 +39,7 @@ using MyClassPrxPtr = ::std::optional; namespace Test { -using NV = ::std::map; +using NV = ::std::map<::std::int32_t, ::std::int32_t>; using NR = ::std::map<::std::string, ::std::string>; @@ -47,9 +47,9 @@ using NDV = ::std::map<::std::string, NV>; using NDR = ::std::map<::std::string, NR>; -using AIS = ::std::vector; +using AIS = ::std::vector<::std::int32_t>; -using GIS = ::std::vector; +using GIS = ::std::vector<::std::int32_t>; using ASS = ::std::vector<::std::string>; diff --git a/slice2cpp/csharp/test/Ice/dispatcher/Test.cpp b/slice2cpp/csharp/test/Ice/dispatcher/Test.cpp index 5cbc3cb5e5f5..77ed4d8ca345 100644 --- a/slice2cpp/csharp/test/Ice/dispatcher/Test.cpp +++ b/slice2cpp/csharp/test/Ice/dispatcher/Test.cpp @@ -107,19 +107,19 @@ Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsync /// \endcond void -Test::TestIntfPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_to, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -130,7 +130,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -324,7 +324,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); diff --git a/slice2cpp/csharp/test/Ice/dispatcher/Test.h b/slice2cpp/csharp/test/Ice/dispatcher/Test.h index eb5f2107e53f..2582f57cb89a 100644 --- a/slice2cpp/csharp/test/Ice/dispatcher/Test.h +++ b/slice2cpp/csharp/test/Ice/dispatcher/Test.h @@ -67,19 +67,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opWithPayload(const ::Ice::ByteSeq& seq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -283,7 +283,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/enums/Test.h b/slice2cpp/csharp/test/Ice/enums/Test.h index 2a0b5da8f18d..83abf5f1e817 100644 --- a/slice2cpp/csharp/test/Ice/enums/Test.h +++ b/slice2cpp/csharp/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/csharp/test/Ice/exceptions/Test.cpp b/slice2cpp/csharp/test/Ice/exceptions/Test.cpp index e44084fb4e84..19e5423be660 100644 --- a/slice2cpp/csharp/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/csharp/test/Ice/exceptions/Test.cpp @@ -228,19 +228,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -251,7 +251,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -277,19 +277,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -300,7 +300,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -314,11 +314,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; } @@ -330,19 +330,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -353,7 +353,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -379,19 +379,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -402,7 +402,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -428,19 +428,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -451,7 +451,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -477,19 +477,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -500,7 +500,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,19 +526,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -549,7 +549,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -575,19 +575,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -598,7 +598,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -610,19 +610,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -633,7 +633,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -645,19 +645,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -668,7 +668,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1098,7 +1098,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1113,7 +1113,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1128,8 +1128,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1144,9 +1144,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1161,8 +1161,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1177,9 +1177,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1194,9 +1194,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1211,7 +1211,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1226,8 +1226,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1242,9 +1242,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/csharp/test/Ice/exceptions/Test.h b/slice2cpp/csharp/test/Ice/exceptions/Test.h index 0cf39915c5bf..fd80d198bd6f 100644 --- a/slice2cpp/csharp/test/Ice/exceptions/Test.h +++ b/slice2cpp/csharp/test/Ice/exceptions/Test.h @@ -151,154 +151,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -532,7 +532,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -541,7 +541,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -552,7 +552,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -572,7 +572,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -582,7 +582,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -593,7 +593,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -609,7 +609,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -619,7 +619,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -630,7 +630,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -646,7 +646,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -655,7 +655,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -666,7 +666,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -758,52 +758,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/exceptions/TestAMD.cpp b/slice2cpp/csharp/test/Ice/exceptions/TestAMD.cpp index 5cc5c566a62b..6661bd094c60 100644 --- a/slice2cpp/csharp/test/Ice/exceptions/TestAMD.cpp +++ b/slice2cpp/csharp/test/Ice/exceptions/TestAMD.cpp @@ -228,19 +228,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -251,7 +251,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -277,19 +277,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -300,7 +300,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -330,19 +330,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -353,7 +353,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -379,19 +379,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -402,7 +402,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -428,19 +428,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -451,7 +451,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -477,19 +477,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -500,7 +500,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,19 +526,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -549,7 +549,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -575,19 +575,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -598,7 +598,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -610,19 +610,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -633,7 +633,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -645,19 +645,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -668,7 +668,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1108,7 +1108,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1123,7 +1123,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1138,8 +1138,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1154,9 +1154,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1171,8 +1171,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1187,9 +1187,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1204,9 +1204,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1221,7 +1221,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1236,8 +1236,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1252,9 +1252,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); diff --git a/slice2cpp/csharp/test/Ice/exceptions/TestAMD.h b/slice2cpp/csharp/test/Ice/exceptions/TestAMD.h index 2e8312c1c412..5fa0ac4d20f8 100644 --- a/slice2cpp/csharp/test/Ice/exceptions/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/exceptions/TestAMD.h @@ -151,154 +151,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -532,7 +532,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -541,7 +541,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -552,7 +552,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -572,7 +572,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -582,7 +582,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -593,7 +593,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -609,7 +609,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -619,7 +619,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -630,7 +630,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -646,7 +646,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -655,7 +655,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -666,7 +666,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -758,52 +758,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorDAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasAAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasAAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasBAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/faultTolerance/Test.cpp b/slice2cpp/csharp/test/Ice/faultTolerance/Test.cpp index a353ce8e034d..0eedbb788b34 100644 --- a/slice2cpp/csharp/test/Ice/faultTolerance/Test.cpp +++ b/slice2cpp/csharp/test/Ice/faultTolerance/Test.cpp @@ -166,30 +166,30 @@ Test::TestIntfPrx::_iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int +::std::int32_t Test::TestIntfPrx::pid(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_pid, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_pid, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::pidAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_pid, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_pid, context); } ::std::function -Test::TestIntfPrx::pidAsync(::std::function response, +Test::TestIntfPrx::pidAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_pid_name); outAsync->invoke(iceC_Test_TestIntf_pid_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -308,7 +308,7 @@ Test::TestIntf::_iceD_pid(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->pid(current); + ::std::int32_t ret = this->pid(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/csharp/test/Ice/faultTolerance/Test.h b/slice2cpp/csharp/test/Ice/faultTolerance/Test.h index fba56a359a5e..48dfa3569e22 100644 --- a/slice2cpp/csharp/test/Ice/faultTolerance/Test.h +++ b/slice2cpp/csharp/test/Ice/faultTolerance/Test.h @@ -94,18 +94,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - pidAsync(::std::function response, + pidAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -276,7 +276,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_idempotentAbort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int pid(const ::Ice::Current& current) = 0; + virtual ::std::int32_t pid(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_pid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/hash/Test.h b/slice2cpp/csharp/test/Ice/hash/Test.h index e77cee4390d1..71fa3105d8bd 100644 --- a/slice2cpp/csharp/test/Ice/hash/Test.h +++ b/slice2cpp/csharp/test/Ice/hash/Test.h @@ -45,7 +45,7 @@ namespace Test using Points = ::std::vector; -using StringColorMap = ::std::map; +using StringColorMap = ::std::map<::std::int32_t, Color>; } @@ -86,14 +86,14 @@ struct PointD struct Point { - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -115,16 +115,16 @@ struct Polyline struct Color { - int r; - int g; - int b; - int a; + ::std::int32_t r; + ::std::int32_t g; + ::std::int32_t b; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(r, g, b, a); } @@ -188,7 +188,7 @@ class Pen : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Pen(int thickness, const ::Test::Color& color) : + Pen(::std::int32_t thickness, const ::Test::Color& color) : thickness(thickness), color(color) { @@ -198,7 +198,7 @@ class Pen : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(thickness, color); } @@ -209,7 +209,7 @@ class Pen : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int thickness; + ::std::int32_t thickness; ::Test::Color color; }; @@ -265,7 +265,7 @@ class InvalidPointException : public ::Ice::UserExceptionHelper(), index(index) { @@ -275,7 +275,7 @@ class InvalidPointException : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(index); } @@ -286,7 +286,7 @@ class InvalidPointException : public ::Ice::UserExceptionHelper @@ -302,7 +302,7 @@ class InvalidLengthException : public ::Ice::UserExceptionHelper(), length(length) { @@ -312,7 +312,7 @@ class InvalidLengthException : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(length); } @@ -323,7 +323,7 @@ class InvalidLengthException : public ::Ice::UserExceptionHelper @@ -339,7 +339,7 @@ class OtherException : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y, z, b); } @@ -362,9 +362,9 @@ class OtherException : public ::Ice::UserExceptionHelper(true, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context).get(); } ::std::future -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context); } ::std::function -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HoldPrx::putOnHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_putOnHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -126,31 +126,31 @@ Test::HoldPrx::_iceI_waitForHold(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::HoldPrx::set(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::int32_t +Test::HoldPrx::set(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); } -::std::future -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } ::std::function -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, - ::std::function response, +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } /// \cond INTERNAL void -Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_delay, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hold_set_name); outAsync->invoke(iceC_Test_Hold_set_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -163,19 +163,19 @@ Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context).get(); } ::std::future -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context); } ::std::function -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -186,7 +186,7 @@ Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, /// \cond INTERNAL void -Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_setOneway_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -265,7 +265,7 @@ Test::Hold::_iceD_putOnHold(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->putOnHold(iceP_seconds, current); @@ -292,11 +292,11 @@ Test::Hold::_iceD_set(::IceInternal::Incoming& inS, const ::Ice::Current& curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_delay; + ::std::int32_t iceP_value; + ::std::int32_t iceP_delay; istr->readAll(iceP_value, iceP_delay); inS.endReadParams(); - int ret = this->set(iceP_value, iceP_delay, current); + ::std::int32_t ret = this->set(iceP_value, iceP_delay, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -310,8 +310,8 @@ Test::Hold::_iceD_setOneway(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_expected; + ::std::int32_t iceP_value; + ::std::int32_t iceP_expected; istr->readAll(iceP_value, iceP_expected); inS.endReadParams(); this->setOneway(iceP_value, iceP_expected, current); diff --git a/slice2cpp/csharp/test/Ice/hold/Test.h b/slice2cpp/csharp/test/Ice/hold/Test.h index a3f39ea30458..f0230f6fa5f4 100644 --- a/slice2cpp/csharp/test/Ice/hold/Test.h +++ b/slice2cpp/csharp/test/Ice/hold/Test.h @@ -48,19 +48,19 @@ class HoldPrx : public ::Ice::Proxy { public: - void putOnHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void putOnHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future putOnHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future putOnHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - putOnHoldAsync(int seconds, + putOnHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitForHold(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -77,34 +77,34 @@ class HoldPrx : public ::Ice::Proxy void _iceI_waitForHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int set(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setAsync(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> setAsync(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setAsync(int value, int delay, - ::std::function response, + setAsync(::std::int32_t value, ::std::int32_t delay, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void setOneway(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setOnewayAsync(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setOnewayAsync(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setOnewayAsync(int value, int expected, + setOnewayAsync(::std::int32_t value, ::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -208,7 +208,7 @@ class Hold : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void putOnHold(int seconds, const ::Ice::Current& current) = 0; + virtual void putOnHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_putOnHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -218,12 +218,12 @@ class Hold : public virtual ::Ice::Object bool _iceD_waitForHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int set(int value, int delay, const ::Ice::Current& current) = 0; + virtual ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_set(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void setOneway(int value, int expected, const ::Ice::Current& current) = 0; + virtual void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/interceptor/Test.cpp b/slice2cpp/csharp/test/Ice/interceptor/Test.cpp index 331d19fd4ddd..e2cfab69b858 100644 --- a/slice2cpp/csharp/test/Ice/interceptor/Test.cpp +++ b/slice2cpp/csharp/test/Ice/interceptor/Test.cpp @@ -72,31 +72,31 @@ const ::std::string iceC_Test_MyObject_amdBadSystemAdd_name = "amdBadSystemAdd"; } -int -Test::MyObjectPrx::add(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::add(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_add_name); outAsync->invoke(iceC_Test_MyObject_add_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -108,31 +108,31 @@ Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyn } /// \endcond -int -Test::MyObjectPrx::addWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::addWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_addWithRetry_name); outAsync->invoke(iceC_Test_MyObject_addWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -144,31 +144,31 @@ Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::badAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badAdd_name); outAsync->invoke(iceC_Test_MyObject_badAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -193,31 +193,31 @@ Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::notExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::notExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_notExistAdd_name); outAsync->invoke(iceC_Test_MyObject_notExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -229,31 +229,31 @@ Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::Outg } /// \endcond -int -Test::MyObjectPrx::badSystemAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badSystemAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badSystemAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badSystemAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badSystemAdd_name); outAsync->invoke(iceC_Test_MyObject_badSystemAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -265,31 +265,31 @@ Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::amdAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAdd_name); outAsync->invoke(iceC_Test_MyObject_amdAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -301,31 +301,31 @@ Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::amdAddWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAddWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAddWithRetry_name); outAsync->invoke(iceC_Test_MyObject_amdAddWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -337,31 +337,31 @@ Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int -Test::MyObjectPrx::amdBadAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -386,31 +386,31 @@ Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::Outgoi } /// \endcond -int -Test::MyObjectPrx::amdNotExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdNotExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdNotExistAdd_name); outAsync->invoke(iceC_Test_MyObject_amdNotExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -422,31 +422,31 @@ Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::O } /// \endcond -int -Test::MyObjectPrx::amdBadSystemAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadSystemAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadSystemAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadSystemAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadSystemAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadSystemAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,11 +506,11 @@ Test::MyObject::_iceD_add(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->add(iceP_x, iceP_y, current); + ::std::int32_t ret = this->add(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -524,11 +524,11 @@ Test::MyObject::_iceD_addWithRetry(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->addWithRetry(iceP_x, iceP_y, current); + ::std::int32_t ret = this->addWithRetry(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -542,11 +542,11 @@ Test::MyObject::_iceD_badAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -560,11 +560,11 @@ Test::MyObject::_iceD_notExistAdd(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->notExistAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->notExistAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -578,11 +578,11 @@ Test::MyObject::_iceD_badSystemAdd(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badSystemAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badSystemAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -596,12 +596,12 @@ Test::MyObject::_iceD_amdAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -619,12 +619,12 @@ Test::MyObject::_iceD_amdAddWithRetry(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -642,12 +642,12 @@ Test::MyObject::_iceD_amdBadAdd(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -665,12 +665,12 @@ Test::MyObject::_iceD_amdNotExistAdd(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -688,12 +688,12 @@ Test::MyObject::_iceD_amdBadSystemAdd(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/csharp/test/Ice/interceptor/Test.h b/slice2cpp/csharp/test/Ice/interceptor/Test.h index 617bd2dd921a..889d6a20d6c7 100644 --- a/slice2cpp/csharp/test/Ice/interceptor/Test.h +++ b/slice2cpp/csharp/test/Ice/interceptor/Test.h @@ -48,154 +48,154 @@ class MyObjectPrx : public ::Ice::Proxy { public: - int add(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addAsync(int x, int y, - ::std::function response, + addAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int addWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addWithRetryAsync(int x, int y, - ::std::function response, + addWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badAddAsync(int x, int y, - ::std::function response, + badAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int notExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future notExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> notExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - notExistAddAsync(int x, int y, - ::std::function response, + notExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badSystemAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badSystemAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badSystemAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badSystemAddAsync(int x, int y, - ::std::function response, + badSystemAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddAsync(int x, int y, - ::std::function response, + amdAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAddWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAddWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddWithRetryAsync(int x, int y, - ::std::function response, + amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadAddAsync(int x, int y, - ::std::function response, + amdBadAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdNotExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdNotExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdNotExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdNotExistAddAsync(int x, int y, - ::std::function response, + amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadSystemAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadSystemAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadSystemAddAsync(int x, int y, - ::std::function response, + amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -330,52 +330,52 @@ class MyObject : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual int add(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_add(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int addWithRetry(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_addWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int notExistAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_notExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badSystemAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badSystemAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddWithRetryAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAddWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdNotExistAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdNotExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadSystemAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadSystemAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/location/Test.cpp b/slice2cpp/csharp/test/Ice/location/Test.cpp index 457a88f7cfee..f59447f9b4eb 100644 --- a/slice2cpp/csharp/test/Ice/location/Test.cpp +++ b/slice2cpp/csharp/test/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/csharp/test/Ice/location/Test.h b/slice2cpp/csharp/test/Ice/location/Test.h index 54689962018c..5e6f07b7aa2d 100644 --- a/slice2cpp/csharp/test/Ice/location/Test.h +++ b/slice2cpp/csharp/test/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/metrics/Test.h b/slice2cpp/csharp/test/Ice/metrics/Test.h index 8ec1cb42d2fe..62b91201fe9e 100644 --- a/slice2cpp/csharp/test/Ice/metrics/Test.h +++ b/slice2cpp/csharp/test/Ice/metrics/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/csharp/test/Ice/metrics/TestAMD.h b/slice2cpp/csharp/test/Ice/metrics/TestAMD.h index 1d479033bd3b..defcbd6db996 100644 --- a/slice2cpp/csharp/test/Ice/metrics/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/metrics/TestAMD.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/csharp/test/Ice/namespacemd/Namespace.h b/slice2cpp/csharp/test/Ice/namespacemd/Namespace.h index c5d998cc95ee..31f171f80e77 100644 --- a/slice2cpp/csharp/test/Ice/namespacemd/Namespace.h +++ b/slice2cpp/csharp/test/Ice/namespacemd/Namespace.h @@ -58,7 +58,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -67,7 +67,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -78,7 +78,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -101,7 +101,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -111,7 +111,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -122,7 +122,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -143,7 +143,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -152,7 +152,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -163,7 +163,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -183,7 +183,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -193,7 +193,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -204,7 +204,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } diff --git a/slice2cpp/csharp/test/Ice/namespacemd/NoNamespace.h b/slice2cpp/csharp/test/Ice/namespacemd/NoNamespace.h index 2cc24a039112..d01a65db3ff0 100644 --- a/slice2cpp/csharp/test/Ice/namespacemd/NoNamespace.h +++ b/slice2cpp/csharp/test/Ice/namespacemd/NoNamespace.h @@ -58,7 +58,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -67,7 +67,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -78,7 +78,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -101,7 +101,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -111,7 +111,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -122,7 +122,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -143,7 +143,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -152,7 +152,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -163,7 +163,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -183,7 +183,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -193,7 +193,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -204,7 +204,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; /** @@ -223,7 +223,7 @@ class notify : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - notify(int i) : + notify(::std::int32_t i) : i(i) { } @@ -232,7 +232,7 @@ class notify : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -243,7 +243,7 @@ class notify : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; } diff --git a/slice2cpp/csharp/test/Ice/objects/Test.h b/slice2cpp/csharp/test/Ice/objects/Test.h index 0223ac6c54b3..e34cfe95bd52 100644 --- a/slice2cpp/csharp/test/Ice/objects/Test.h +++ b/slice2cpp/csharp/test/Ice/objects/Test.h @@ -104,7 +104,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -122,9 +122,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -843,14 +843,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -858,13 +858,13 @@ struct StructKey struct S1 { - int id; + ::std::int32_t id; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id); } @@ -1161,7 +1161,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1171,7 +1171,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1184,7 +1184,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/csharp/test/Ice/operations/Test.cpp b/slice2cpp/csharp/test/Ice/operations/Test.cpp index dfc8dae0d367..570cec535621 100644 --- a/slice2cpp/csharp/test/Ice/operations/Test.cpp +++ b/slice2cpp/csharp/test/Ice/operations/Test.cpp @@ -466,37 +466,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -507,7 +507,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -562,39 +562,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,7 +605,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2563,30 +2563,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2724,31 +2724,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2760,31 +2760,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2796,31 +2796,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2832,31 +2832,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3644,12 +3644,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3682,15 +3682,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4485,7 +4485,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4553,10 +4553,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4570,10 +4570,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4587,10 +4587,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4604,10 +4604,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/csharp/test/Ice/operations/Test.h b/slice2cpp/csharp/test/Ice/operations/Test.h index 38d2f436e0f2..d414d73bab42 100644 --- a/slice2cpp/csharp/test/Ice/operations/Test.h +++ b/slice2cpp/csharp/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -108,11 +108,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -136,15 +136,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -294,19 +294,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -324,19 +324,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -954,18 +954,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1025,64 +1025,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1565,14 +1565,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1747,11 +1747,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1775,13 +1775,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2350,7 +2350,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2375,22 +2375,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/operations/TestAMD.cpp b/slice2cpp/csharp/test/Ice/operations/TestAMD.cpp index c86848d69866..5dbd2877be1a 100644 --- a/slice2cpp/csharp/test/Ice/operations/TestAMD.cpp +++ b/slice2cpp/csharp/test/Ice/operations/TestAMD.cpp @@ -379,37 +379,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,7 +420,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -475,39 +475,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -518,7 +518,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2476,30 +2476,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2637,31 +2637,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2673,31 +2673,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2709,31 +2709,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2745,31 +2745,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3545,12 +3545,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret, ::Ice::Byte iceP_p3) + auto responseCB = [inA](::std::uint8_t ret, ::std::uint8_t iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p3, ret); @@ -3591,13 +3591,13 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret, short iceP_p4, int iceP_p5, long long int iceP_p6) + auto responseCB = [inA](::std::int64_t ret, ::std::int16_t iceP_p4, ::std::int32_t iceP_p5, ::std::int64_t iceP_p6) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); @@ -4550,7 +4550,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4627,11 +4627,11 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret) + auto responseCB = [inA](::std::uint8_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4649,11 +4649,11 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](short ret) + auto responseCB = [inA](::std::int16_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4671,11 +4671,11 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4693,11 +4693,11 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret) + auto responseCB = [inA](::std::int64_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/csharp/test/Ice/operations/TestAMD.h b/slice2cpp/csharp/test/Ice/operations/TestAMD.h index 560ff82949d4..eaf05ac489bc 100644 --- a/slice2cpp/csharp/test/Ice/operations/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/operations/TestAMD.h @@ -56,15 +56,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -98,11 +98,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -126,15 +126,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -279,19 +279,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -309,19 +309,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -939,18 +939,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1010,64 +1010,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1480,14 +1480,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1627,11 +1627,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual void opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1655,13 +1655,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual void opShortIntLongAsync(short p1, int p2, long long int p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2230,7 +2230,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2255,22 +2255,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByte1Async(::Ice::Byte opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByte1Async(::std::uint8_t opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opShort1Async(short opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShort1Async(::std::int16_t opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opInt1Async(int opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opInt1Async(::std::int32_t opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opLong1Async(long long int opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLong1Async(::std::int64_t opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/optional/Test.cpp b/slice2cpp/csharp/test/Ice/optional/Test.cpp index fcb2951ee3a4..8f4a1a800ae6 100644 --- a/slice2cpp/csharp/test/Ice/optional/Test.cpp +++ b/slice2cpp/csharp/test/Ice/optional/Test.cpp @@ -314,19 +314,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -337,7 +337,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -363,19 +363,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -386,7 +386,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -412,19 +412,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -435,7 +435,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -460,37 +460,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -501,7 +501,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -556,37 +556,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -597,44 +597,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -645,44 +645,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -693,7 +693,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2915,7 +2915,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2932,7 +2932,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2949,7 +2949,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2966,11 +2966,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3002,11 +3002,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3020,11 +3020,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3038,11 +3038,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/csharp/test/Ice/optional/Test.h b/slice2cpp/csharp/test/Ice/optional/Test.h index 15d148e0c602..5b46d27ebf49 100644 --- a/slice2cpp/csharp/test/Ice/optional/Test.h +++ b/slice2cpp/csharp/test/Ice/optional/Test.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,19 +97,19 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -217,64 +217,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -292,49 +292,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1013,13 +1013,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1027,13 +1027,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1055,13 +1055,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1095,7 +1095,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1104,7 +1104,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1115,7 +1115,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1138,7 +1138,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos) : a(a), b(b), c(c), @@ -1175,7 +1175,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos); } @@ -1186,11 +1186,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1233,7 +1233,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1245,7 +1245,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1256,10 +1256,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1278,7 +1278,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1289,7 +1289,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1313,8 +1313,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1339,7 +1339,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1350,7 +1350,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1381,7 +1381,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1391,7 +1391,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1402,7 +1402,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1596,7 +1596,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1605,7 +1605,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1616,7 +1616,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1721,7 +1721,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1733,7 +1733,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1745,7 +1745,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1767,7 +1767,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1780,7 +1780,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1810,7 +1810,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1821,7 +1821,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1933,17 +1933,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1953,11 +1953,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1981,11 +1981,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1995,11 +1995,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2009,11 +2009,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/optional/TestAMD.cpp b/slice2cpp/csharp/test/Ice/optional/TestAMD.cpp index e0eeb36da5bc..550de5e60f31 100644 --- a/slice2cpp/csharp/test/Ice/optional/TestAMD.cpp +++ b/slice2cpp/csharp/test/Ice/optional/TestAMD.cpp @@ -314,19 +314,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -337,7 +337,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -363,19 +363,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -386,7 +386,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -412,19 +412,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -435,7 +435,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -460,37 +460,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -501,7 +501,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -556,37 +556,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -597,44 +597,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -645,44 +645,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -693,7 +693,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2920,7 +2920,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2937,7 +2937,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2954,7 +2954,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2971,11 +2971,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::Ice::Byte>& ret, const std::optional<::Ice::Byte>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::uint8_t>& ret, const std::optional<::std::uint8_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3015,11 +3015,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int16_t>& ret, const std::optional<::std::int16_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3037,11 +3037,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int32_t>& ret, const std::optional<::std::int32_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3059,11 +3059,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int64_t>& ret, const std::optional<::std::int64_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); diff --git a/slice2cpp/csharp/test/Ice/optional/TestAMD.h b/slice2cpp/csharp/test/Ice/optional/TestAMD.h index 5d61619fcee4..d72018eb8ad4 100644 --- a/slice2cpp/csharp/test/Ice/optional/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/optional/TestAMD.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,19 +97,19 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -217,64 +217,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -292,49 +292,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1013,13 +1013,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1027,13 +1027,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1055,13 +1055,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1095,7 +1095,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1104,7 +1104,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1115,7 +1115,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1138,7 +1138,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos) : a(a), b(b), c(c), @@ -1175,7 +1175,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos); } @@ -1186,11 +1186,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1233,7 +1233,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1245,7 +1245,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1256,10 +1256,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1278,7 +1278,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1289,7 +1289,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1313,8 +1313,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1339,7 +1339,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1350,7 +1350,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1381,7 +1381,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1391,7 +1391,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1402,7 +1402,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1596,7 +1596,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1605,7 +1605,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1616,7 +1616,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1721,7 +1721,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1733,7 +1733,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1745,7 +1745,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1767,7 +1767,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1780,7 +1780,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1810,7 +1810,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1821,7 +1821,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1933,17 +1933,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opOptionalExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opDerivedExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opRequiredExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1953,11 +1953,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual void opByteAsync(std::optional<::Ice::Byte> p1, ::std::function& returnValue, const std::optional<::Ice::Byte>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(std::optional<::std::uint8_t> p1, ::std::function& returnValue, const std::optional<::std::uint8_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1981,11 +1981,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual void opShortAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortAsync(std::optional<::std::int16_t> p1, ::std::function& returnValue, const std::optional<::std::int16_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1995,11 +1995,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual void opIntAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opIntAsync(std::optional<::std::int32_t> p1, ::std::function& returnValue, const std::optional<::std::int32_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2009,11 +2009,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual void opLongAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLongAsync(std::optional<::std::int64_t> p1, ::std::function& returnValue, const std::optional<::std::int64_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/retry/Test.cpp b/slice2cpp/csharp/test/Ice/retry/Test.cpp index ee86b069d353..861ae2bfa6b8 100644 --- a/slice2cpp/csharp/test/Ice/retry/Test.cpp +++ b/slice2cpp/csharp/test/Ice/retry/Test.cpp @@ -97,31 +97,31 @@ Test::RetryPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); } -::std::future -Test::RetryPrx::opIdempotentAsync(int iceP_c, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); } ::std::function -Test::RetryPrx::opIdempotentAsync(int iceP_c, - ::std::function response, +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); } /// \cond INTERNAL void -Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_c, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Retry_opIdempotent_name); outAsync->invoke(iceC_Test_Retry_opIdempotent_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -196,19 +196,19 @@ Test::RetryPrx::_iceI_opSystemException(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::RetryPrx::sleep(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleep(::std::int32_t iceP_delay, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &RetryPrx::_iceI_sleep, iceP_delay, context).get(); } ::std::future -Test::RetryPrx::sleepAsync(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_sleep, iceP_delay, context); } ::std::function -Test::RetryPrx::sleepAsync(int iceP_delay, +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, ::std::function response, ::std::function ex, ::std::function sent, @@ -219,7 +219,7 @@ Test::RetryPrx::sleepAsync(int iceP_delay, /// \cond INTERNAL void -Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Retry_sleep_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -313,10 +313,10 @@ Test::Retry::_iceD_opIdempotent(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_c; + ::std::int32_t iceP_c; istr->readAll(iceP_c); inS.endReadParams(); - int ret = this->opIdempotent(iceP_c, current); + ::std::int32_t ret = this->opIdempotent(iceP_c, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -354,7 +354,7 @@ Test::Retry::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& cur { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_delay; + ::std::int32_t iceP_delay; istr->readAll(iceP_delay); inS.endReadParams(); this->sleep(iceP_delay, current); diff --git a/slice2cpp/csharp/test/Ice/retry/Test.h b/slice2cpp/csharp/test/Ice/retry/Test.h index 5c5ba2348735..e76f1fbe7a00 100644 --- a/slice2cpp/csharp/test/Ice/retry/Test.h +++ b/slice2cpp/csharp/test/Ice/retry/Test.h @@ -63,19 +63,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - int opIdempotent(int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIdempotentAsync(int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIdempotentAsync(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIdempotentAsync(int c, - ::std::function response, + opIdempotentAsync(::std::int32_t c, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opNotIdempotent(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -106,19 +106,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_opSystemException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int delay, + sleepAsync(::std::int32_t delay, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -227,7 +227,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opIdempotent(int c, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -242,7 +242,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_opSystemException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int delay, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/scope/Test.h b/slice2cpp/csharp/test/Ice/scope/Test.h index d2dbb755684c..9ebc4e11d311 100644 --- a/slice2cpp/csharp/test/Ice/scope/Test.h +++ b/slice2cpp/csharp/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/csharp/test/Ice/seqMapping/Test.h b/slice2cpp/csharp/test/Ice/seqMapping/Test.h index 293f04ce4ace..543000c25b8e 100644 --- a/slice2cpp/csharp/test/Ice/seqMapping/Test.h +++ b/slice2cpp/csharp/test/Ice/seqMapping/Test.h @@ -47,17 +47,17 @@ using MyClassPrxPtr = ::std::optional; namespace Test { -using AByteS = ::std::vector<::Ice::Byte>; +using AByteS = ::std::vector<::std::uint8_t>; -using LByteS = ::std::vector<::Ice::Byte>; +using LByteS = ::std::vector<::std::uint8_t>; -using KByteS = ::std::vector<::Ice::Byte>; +using KByteS = ::std::vector<::std::uint8_t>; -using QByteS = ::std::vector<::Ice::Byte>; +using QByteS = ::std::vector<::std::uint8_t>; -using SByteS = ::std::vector<::Ice::Byte>; +using SByteS = ::std::vector<::std::uint8_t>; -using CByteS = ::std::vector<::Ice::Byte>; +using CByteS = ::std::vector<::std::uint8_t>; using ABoolS = ::std::vector; @@ -71,41 +71,41 @@ using SBoolS = ::std::vector; using CBoolS = ::std::vector; -using AShortS = ::std::vector; +using AShortS = ::std::vector<::std::int16_t>; -using LShortS = ::std::vector; +using LShortS = ::std::vector<::std::int16_t>; -using KShortS = ::std::vector; +using KShortS = ::std::vector<::std::int16_t>; -using QShortS = ::std::vector; +using QShortS = ::std::vector<::std::int16_t>; -using SShortS = ::std::vector; +using SShortS = ::std::vector<::std::int16_t>; -using CShortS = ::std::vector; +using CShortS = ::std::vector<::std::int16_t>; -using AIntS = ::std::vector; +using AIntS = ::std::vector<::std::int32_t>; -using LIntS = ::std::vector; +using LIntS = ::std::vector<::std::int32_t>; -using KIntS = ::std::vector; +using KIntS = ::std::vector<::std::int32_t>; -using QIntS = ::std::vector; +using QIntS = ::std::vector<::std::int32_t>; -using SIntS = ::std::vector; +using SIntS = ::std::vector<::std::int32_t>; -using CIntS = ::std::vector; +using CIntS = ::std::vector<::std::int32_t>; -using ALongS = ::std::vector; +using ALongS = ::std::vector<::std::int64_t>; -using LLongS = ::std::vector; +using LLongS = ::std::vector<::std::int64_t>; -using KLongS = ::std::vector; +using KLongS = ::std::vector<::std::int64_t>; -using QLongS = ::std::vector; +using QLongS = ::std::vector<::std::int64_t>; -using SLongS = ::std::vector; +using SLongS = ::std::vector<::std::int64_t>; -using CLongS = ::std::vector; +using CLongS = ::std::vector<::std::int64_t>; using AFloatS = ::std::vector; @@ -226,7 +226,7 @@ using SEnS = ::std::vector; using CEnS = ::std::vector; -using CustomIntS = ::std::vector; +using CustomIntS = ::std::vector<::std::int32_t>; using CustomCVS = ::std::vector<::std::shared_ptr>; @@ -1489,13 +1489,13 @@ namespace Test struct S { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1503,13 +1503,13 @@ struct S struct SD { - int i = 1; + ::std::int32_t i = 1; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1543,7 +1543,7 @@ class CV : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit CV(int i) : + explicit CV(::std::int32_t i) : i(i) { } @@ -1552,7 +1552,7 @@ class CV : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1563,7 +1563,7 @@ class CV : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/csharp/test/Ice/seqMapping/TestAMD.h b/slice2cpp/csharp/test/Ice/seqMapping/TestAMD.h index 526026682358..a3fb641e7aea 100644 --- a/slice2cpp/csharp/test/Ice/seqMapping/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/seqMapping/TestAMD.h @@ -47,15 +47,15 @@ using MyClassPrxPtr = ::std::optional; namespace Test { -using AByteS = ::std::vector<::Ice::Byte>; +using AByteS = ::std::vector<::std::uint8_t>; -using LByteS = ::std::vector<::Ice::Byte>; +using LByteS = ::std::vector<::std::uint8_t>; -using KByteS = ::std::vector<::Ice::Byte>; +using KByteS = ::std::vector<::std::uint8_t>; -using QByteS = ::std::vector<::Ice::Byte>; +using QByteS = ::std::vector<::std::uint8_t>; -using SByteS = ::std::vector<::Ice::Byte>; +using SByteS = ::std::vector<::std::uint8_t>; using ABoolS = ::std::vector; @@ -67,35 +67,35 @@ using QBoolS = ::std::vector; using SBoolS = ::std::vector; -using AShortS = ::std::vector; +using AShortS = ::std::vector<::std::int16_t>; -using LShortS = ::std::vector; +using LShortS = ::std::vector<::std::int16_t>; -using KShortS = ::std::vector; +using KShortS = ::std::vector<::std::int16_t>; -using QShortS = ::std::vector; +using QShortS = ::std::vector<::std::int16_t>; -using SShortS = ::std::vector; +using SShortS = ::std::vector<::std::int16_t>; -using AIntS = ::std::vector; +using AIntS = ::std::vector<::std::int32_t>; -using LIntS = ::std::vector; +using LIntS = ::std::vector<::std::int32_t>; -using KIntS = ::std::vector; +using KIntS = ::std::vector<::std::int32_t>; -using QIntS = ::std::vector; +using QIntS = ::std::vector<::std::int32_t>; -using SIntS = ::std::vector; +using SIntS = ::std::vector<::std::int32_t>; -using ALongS = ::std::vector; +using ALongS = ::std::vector<::std::int64_t>; -using LLongS = ::std::vector; +using LLongS = ::std::vector<::std::int64_t>; -using KLongS = ::std::vector; +using KLongS = ::std::vector<::std::int64_t>; -using QLongS = ::std::vector; +using QLongS = ::std::vector<::std::int64_t>; -using SLongS = ::std::vector; +using SLongS = ::std::vector<::std::int64_t>; using AFloatS = ::std::vector; @@ -196,7 +196,7 @@ using QEnS = ::std::vector; using SEnS = ::std::vector; -using CustomIntS = ::std::vector; +using CustomIntS = ::std::vector<::std::int32_t>; using CustomCVS = ::std::vector<::std::shared_ptr>; @@ -1459,13 +1459,13 @@ namespace Test struct S { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1473,13 +1473,13 @@ struct S struct SD { - int i = 1; + ::std::int32_t i = 1; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1513,7 +1513,7 @@ class CV : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit CV(int i) : + explicit CV(::std::int32_t i) : i(i) { } @@ -1522,7 +1522,7 @@ class CV : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1533,7 +1533,7 @@ class CV : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/csharp/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/csharp/test/Ice/slicing/objects/ClientPrivate.h index e09124ade434..3d94a6123b1b 100644 --- a/slice2cpp/csharp/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/csharp/test/Ice/slicing/objects/ClientPrivate.h @@ -104,7 +104,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -114,7 +114,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -163,7 +163,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -173,7 +173,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -203,7 +203,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -213,7 +213,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -224,7 +224,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -243,7 +243,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -253,7 +253,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -283,7 +283,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -293,7 +293,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivate.h b/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivate.h index ac8f7ad46561..ace8c39a13ee 100644 --- a/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivate.h +++ b/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivate.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivateAMD.h b/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivateAMD.h index 6a250c9a6162..0ebb7ec63611 100644 --- a/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivateAMD.h +++ b/slice2cpp/csharp/test/Ice/slicing/objects/ServerPrivateAMD.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/csharp/test/Ice/slicing/objects/Test.h b/slice2cpp/csharp/test/Ice/slicing/objects/Test.h index 83914be23c07..55cff72d32e4 100644 --- a/slice2cpp/csharp/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/csharp/test/Ice/slicing/objects/Test.h @@ -55,7 +55,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -952,7 +952,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -961,7 +961,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -972,7 +972,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -991,7 +991,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1001,7 +1001,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1050,7 +1050,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1060,7 +1060,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1090,7 +1090,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1100,7 +1100,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/csharp/test/Ice/slicing/objects/TestAMD.h b/slice2cpp/csharp/test/Ice/slicing/objects/TestAMD.h index 1f218d17bb88..319dd6bf401a 100644 --- a/slice2cpp/csharp/test/Ice/slicing/objects/TestAMD.h +++ b/slice2cpp/csharp/test/Ice/slicing/objects/TestAMD.h @@ -54,7 +54,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -951,7 +951,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -960,7 +960,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -971,7 +971,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -990,7 +990,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1000,7 +1000,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1049,7 +1049,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1059,7 +1059,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/csharp/test/Ice/stream/Test.h b/slice2cpp/csharp/test/Ice/stream/Test.h index 409f8a15a95c..8f372be82fd4 100644 --- a/slice2cpp/csharp/test/Ice/stream/Test.h +++ b/slice2cpp/csharp/test/Ice/stream/Test.h @@ -74,11 +74,11 @@ using MyEnumSS = ::std::vector; using MyClassSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -86,7 +86,7 @@ using StringMyClassD = ::std::map<::std::string, ::std::shared_ptr>; using BoolList = ::std::vector; -using ByteList = ::std::vector<::Ice::Byte>; +using ByteList = ::std::vector<::std::uint8_t>; using MyEnumList = ::std::vector; @@ -96,15 +96,15 @@ using MyClassList = ::std::vector<::std::shared_ptr>; using MyInterfaceProxyList = ::std::vector<::std::optional>; -using ShortLinkedList = ::std::vector; +using ShortLinkedList = ::std::vector<::std::int16_t>; -using IntLinkedList = ::std::vector; +using IntLinkedList = ::std::vector<::std::int32_t>; using MyEnumLinkedList = ::std::vector; using SmallStructLinkedList = ::std::vector; -using LongStack = ::std::vector; +using LongStack = ::std::vector<::std::int64_t>; using FloatStack = ::std::vector; @@ -193,10 +193,10 @@ namespace Test struct SmallStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -207,7 +207,7 @@ struct SmallStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, p); } @@ -241,7 +241,7 @@ class OptionalClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - OptionalClass(bool bo, ::Ice::Byte by, const std::optional& sh, const std::optional& i) : + OptionalClass(bool bo, ::std::uint8_t by, const std::optional<::std::int16_t>& sh, const std::optional<::std::int32_t>& i) : bo(bo), by(by), sh(sh), @@ -253,7 +253,7 @@ class OptionalClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(bo, by, sh, i); } @@ -265,9 +265,9 @@ class OptionalClass : public ::Ice::ValueHelper static const ::std::string& ice_staticId(); bool bo; - ::Ice::Byte by; - std::optional sh; - std::optional i; + ::std::uint8_t by; + std::optional<::std::int16_t> sh; + std::optional<::std::int32_t> i; }; /// \cond INTERNAL diff --git a/slice2cpp/csharp/test/Ice/timeout/Test.cpp b/slice2cpp/csharp/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/csharp/test/Ice/timeout/Test.cpp +++ b/slice2cpp/csharp/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/csharp/test/Ice/timeout/Test.h b/slice2cpp/csharp/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/csharp/test/Ice/timeout/Test.h +++ b/slice2cpp/csharp/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Ice/udp/Test.h b/slice2cpp/csharp/test/Ice/udp/Test.h index 16a1964952de..227d33e6ee6f 100644 --- a/slice2cpp/csharp/test/Ice/udp/Test.h +++ b/slice2cpp/csharp/test/Ice/udp/Test.h @@ -44,7 +44,7 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/csharp/test/Slice/escape/Clash.cpp b/slice2cpp/csharp/test/Slice/escape/Clash.cpp index d54b5cb2b753..6b831f07f770 100644 --- a/slice2cpp/csharp/test/Slice/escape/Clash.cpp +++ b/slice2cpp/csharp/test/Slice/escape/Clash.cpp @@ -389,19 +389,19 @@ Clash::IntfPrx::_iceI_obj(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT< /// \endcond void -Clash::IntfPrx::op(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::op(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &IntfPrx::_iceI_op, iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, context).get(); } ::std::future -Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &IntfPrx::_iceI_op, iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, context); } ::std::function -Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, +Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, ::std::function response, ::std::function ex, ::std::function sent, @@ -412,7 +412,7 @@ Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& /// \cond INTERNAL void -Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { outAsync->invoke(iceC_Clash_Intf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -425,9 +425,9 @@ Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT& iceP_proxy, std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::opOut(::std::string& iceP_context, ::std::string& iceP_current, ::std::string& iceP_response, ::std::string& iceP_ex, ::std::string& iceP_sent, ::std::string& iceP_cookie, ::std::string& iceP_sync, ::std::string& iceP_result, ::std::string& iceP_istr, ::std::string& iceP_ostr, std::optional<::std::string>& iceP_proxy, std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>(true, this, &IntfPrx::_iceI_opOut, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>(true, this, &IntfPrx::_iceI_opOut, context).get(); iceP_context = ::std::move(::std::get<0>(_result)); iceP_current = ::std::move(::std::get<1>(_result)); iceP_response = ::std::move(::std::get<2>(_result)); @@ -442,28 +442,28 @@ Clash::IntfPrx::opOut(::std::string& iceP_context, ::std::string& iceP_current, iceP_obj = ::std::get<11>(_result); } -::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>> +::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>> Clash::IntfPrx::opOutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>, ::std::promise>(false, this, &IntfPrx::_iceI_opOut, context); + return _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>, ::std::promise>(false, this, &IntfPrx::_iceI_opOut, context); } ::std::function -Clash::IntfPrx::opOutAsync(::std::function, std::optional)> response, +Clash::IntfPrx::opOutAsync(::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>&& _result) + auto _responseCb = [response](::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result)), ::std::move(::std::get<2>(_result)), ::std::move(::std::get<3>(_result)), ::std::move(::std::get<4>(_result)), ::std::move(::std::get<5>(_result)), ::std::move(::std::get<6>(_result)), ::std::move(::std::get<7>(_result)), ::std::move(::std::get<8>(_result)), ::std::move(::std::get<9>(_result)), ::std::move(::std::get<10>(_result)), ::std::get<11>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Clash::IntfPrx::_iceI_opOut, context); + return _makeLambdaOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Clash::IntfPrx::_iceI_opOut, context); } /// \cond INTERNAL void -Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>>& outAsync, const ::Ice::Context& context) const +Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Clash_Intf_opOut_name); outAsync->invoke(iceC_Clash_Intf_opOut_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -471,7 +471,7 @@ Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsync nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional> v; + ::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>> v; istr->readAll(::std::get<0>(v), ::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<4>(v), ::std::get<5>(v), ::std::get<6>(v), ::std::get<7>(v), ::std::get<8>(v), ::std::get<9>(v)); istr->readAll({1, 2}, ::std::get<10>(v), ::std::get<11>(v)); return v; @@ -669,7 +669,7 @@ Clash::Intf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice::Current& curren ::std::string iceP_istr; ::std::string iceP_ostr; std::optional<::std::string> iceP_proxy; - std::optional iceP_obj; + std::optional<::std::int32_t> iceP_obj; istr->readAll(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr); istr->readAll({1, 2}, iceP_proxy, iceP_obj); inS.endReadParams(); @@ -696,7 +696,7 @@ Clash::Intf::_iceD_opOut(::IceInternal::Incoming& inS, const ::Ice::Current& cur ::std::string iceP_istr; ::std::string iceP_ostr; std::optional<::std::string> iceP_proxy; - std::optional iceP_obj; + std::optional<::std::int32_t> iceP_obj; this->opOut(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr); diff --git a/slice2cpp/csharp/test/Slice/escape/Clash.h b/slice2cpp/csharp/test/Slice/escape/Clash.h index 58a5eea5866f..7d45858d898d 100644 --- a/slice2cpp/csharp/test/Slice/escape/Clash.h +++ b/slice2cpp/csharp/test/Slice/escape/Clash.h @@ -190,33 +190,33 @@ class IntfPrx : public ::Ice::Proxy void _iceI_obj(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void op(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; + void op(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; - ::std::future opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; + ::std::future opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; ::std::function - opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, + opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, ::std::function response_, ::std::function ex_ = nullptr, ::std::function sent_ = nullptr, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const std::optional<::std::string>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; + void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>> opOutAsync(const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>> opOutAsync(const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; ::std::function - opOutAsync(::std::function, std::optional)> response, + opOutAsync(::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>>&, const ::Ice::Context&) const; + void _iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>>&, const ::Ice::Context&) const; /// \endcond /** @@ -275,17 +275,17 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; ::std::string hashCode; - int clone; + ::std::int32_t clone; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs, hashCode, clone); } @@ -319,7 +319,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy, int obj, int getCookie, const ::std::string& clone) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy, ::std::int32_t obj, ::std::int32_t getCookie, const ::std::string& clone) : s(s), context(context), current(current), @@ -344,7 +344,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const int&, const int&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::int32_t&, const ::std::int32_t&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy, obj, getCookie, clone); } @@ -357,20 +357,20 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; - int typeId; - short del; - std::optional cookie; + ::std::int32_t current; + ::std::int16_t response; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; ::std::string in; ::std::string proxy; - int obj; - int getCookie; + ::std::int32_t obj; + ::std::int32_t getCookie; ::std::string clone; }; @@ -396,7 +396,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr, const ::std::string& cause) : + Ex(::std::int16_t istr, ::std::int32_t ostr, const ::std::string& cause) : istr(istr), ostr(ostr), cause(cause) @@ -407,7 +407,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr, cause); } @@ -418,8 +418,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; ::std::string cause; }; @@ -516,7 +516,7 @@ class Intf : public virtual ::Ice::Object bool _iceD_obj(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void op(::std::string context, ::std::string current, ::std::string response, ::std::string ex, ::std::string sent, ::std::string cookie, ::std::string sync, ::std::string result, ::std::string istr, ::std::string ostr, std::optional<::std::string> proxy, std::optional obj, const ::Ice::Current& current_) = 0; + virtual void op(::std::string context, ::std::string current, ::std::string response, ::std::string ex, ::std::string sent, ::std::string cookie, ::std::string sync, ::std::string result, ::std::string istr, ::std::string ostr, std::optional<::std::string> proxy, std::optional<::std::int32_t> obj, const ::Ice::Current& current_) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -537,10 +537,10 @@ class Intf : public virtual ::Ice::Object ::std::string istr; ::std::string ostr; std::optional<::std::string> proxy; - std::optional obj; + std::optional<::std::int32_t> obj; }; - virtual void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional& obj, const ::Ice::Current& current_) = 0; + virtual void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional<::std::int32_t>& obj, const ::Ice::Current& current_) = 0; /// \cond INTERNAL bool _iceD_opOut(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Slice/escape/Key.cpp b/slice2cpp/csharp/test/Slice/escape/Key.cpp index 9decf51bee7b..0507bdaa5f92 100644 --- a/slice2cpp/csharp/test/Slice/escape/Key.cpp +++ b/slice2cpp/csharp/test/Slice/escape/Key.cpp @@ -161,30 +161,30 @@ const ::std::string iceC_System_Test_op_name = "op"; } void -abstract::casePrx::_cpp_catch(int iceP_checked, int& iceP_continue, const ::Ice::Context& context) const +abstract::casePrx::_cpp_catch(::std::int32_t iceP_checked, ::std::int32_t& iceP_continue, const ::Ice::Context& context) const { - iceP_continue = _makePromiseOutgoing(true, this, &casePrx::_iceI_catch, iceP_checked, context).get(); + iceP_continue = _makePromiseOutgoing<::std::int32_t>(true, this, &casePrx::_iceI_catch, iceP_checked, context).get(); } -::std::future -abstract::casePrx::catchAsync(int iceP_checked, const ::Ice::Context& context) const +::std::future<::std::int32_t> +abstract::casePrx::catchAsync(::std::int32_t iceP_checked, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &casePrx::_iceI_catch, iceP_checked, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &casePrx::_iceI_catch, iceP_checked, context); } ::std::function -abstract::casePrx::catchAsync(int iceP_checked, - ::std::function response, +abstract::casePrx::catchAsync(::std::int32_t iceP_checked, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &abstract::casePrx::_iceI_catch, iceP_checked, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &abstract::casePrx::_iceI_catch, iceP_checked, context); } /// \cond INTERNAL void -abstract::casePrx::_iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_checked, const ::Ice::Context& context) const +abstract::casePrx::_iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_checked, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_abstract_case_catch_name); outAsync->invoke(iceC_abstract_case_catch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -430,19 +430,19 @@ abstract::optionalParamsPrx::ice_staticId() } ::abstract::as -abstract::implicitPrx::in(const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, int iceP_override, int iceP_params, int iceP_private, const ::Ice::Context& context) const +abstract::implicitPrx::in(const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &implicitPrx::_iceI_in, iceP_internal, iceP_is, iceP_lock, iceP_namespace, iceP_new, iceP_null, iceP_override, iceP_params, iceP_private, context).get(); } ::std::future<::abstract::as> -abstract::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, int iceP_override, int iceP_params, int iceP_private, const ::Ice::Context& context) const +abstract::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &implicitPrx::_iceI_in, iceP_internal, iceP_is, iceP_lock, iceP_namespace, iceP_new, iceP_null, iceP_override, iceP_params, iceP_private, context); } ::std::function -abstract::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, int iceP_override, int iceP_params, int iceP_private, +abstract::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, ::std::function response, ::std::function ex, ::std::function sent, @@ -453,7 +453,7 @@ abstract::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::sha /// \cond INTERNAL void -abstract::implicitPrx::_iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, int iceP_override, int iceP_params, int iceP_private, const ::Ice::Context& context) const +abstract::implicitPrx::_iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_break& iceP_internal, const ::std::shared_ptr& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr& iceP_null, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_abstract_implicit_in_name); outAsync->invoke(iceC_abstract_implicit_in_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -649,11 +649,11 @@ abstract::_cpp_case::_iceD_catch(::IceInternal::Incoming& inS, const ::Ice::Curr { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_checked; + ::std::int32_t iceP_checked; istr->readAll(iceP_checked); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int iceP_continue) + auto responseCB = [inA](::std::int32_t iceP_continue) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_continue); @@ -1051,9 +1051,9 @@ abstract::implicit::_iceD_in(::IceInternal::Incoming& inS, const ::Ice::Current& ::std::optional iceP_namespace; ::std::optional iceP_new; ::std::shared_ptr iceP_null; - int iceP_override; - int iceP_params; - int iceP_private; + ::std::int32_t iceP_override; + ::std::int32_t iceP_params; + ::std::int32_t iceP_private; istr->readAll(iceP_internal, iceP_is, iceP_lock, iceP_namespace, iceP_new, iceP_null, iceP_override, iceP_params, iceP_private); istr->readPendingValues(); inS.endReadParams(); diff --git a/slice2cpp/csharp/test/Slice/escape/Key.h b/slice2cpp/csharp/test/Slice/escape/Key.h index 0e7b89d38246..2470af77cbfa 100644 --- a/slice2cpp/csharp/test/Slice/escape/Key.h +++ b/slice2cpp/csharp/test/Slice/escape/Key.h @@ -85,9 +85,9 @@ enum class as : unsigned char using _cpp_while = ::std::map<::std::string, _cpp_break>; -constexpr int _cpp_protected = 0; +constexpr ::std::int32_t _cpp_protected = 0; -constexpr int _cpp_public = 0; +constexpr ::std::int32_t _cpp_public = 0; namespace System { @@ -108,19 +108,19 @@ class casePrx : public ::Ice::Proxy { public: - void _cpp_catch(int checked, int& _cpp_continue, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void _cpp_catch(::std::int32_t checked, ::std::int32_t& _cpp_continue, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future catchAsync(int checked, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> catchAsync(::std::int32_t checked, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - catchAsync(int checked, - ::std::function response, + catchAsync(::std::int32_t checked, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -412,19 +412,19 @@ class implicitPrx : public ::Ice::Proxy { public: - as in(const _cpp_break& internal, const ::std::shared_ptr& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr& null, int override, int params, int _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + as in(const _cpp_break& internal, const ::std::shared_ptr& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr& null, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future inAsync(const _cpp_break& internal, const ::std::shared_ptr& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr& null, int override, int params, int _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future inAsync(const _cpp_break& internal, const ::std::shared_ptr& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr& null, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - inAsync(const _cpp_break& internal, const ::std::shared_ptr& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr& null, int override, int params, int _cpp_private, + inAsync(const _cpp_break& internal, const ::std::shared_ptr& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr& null, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_break&, const ::std::shared_ptr&, const ::std::optional&, const ::std::optional&, const ::std::optional&, const ::std::shared_ptr&, int, int, int, const ::Ice::Context&) const; + void _iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_break&, const ::std::shared_ptr&, const ::std::optional&, const ::std::optional&, const ::std::optional&, const ::std::shared_ptr&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -624,13 +624,13 @@ namespace abstract struct _cpp_break { - int readonly; + ::std::int32_t readonly; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(readonly); } @@ -664,7 +664,7 @@ class delegate : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - delegate(int _cpp_if, const ::std::optional<::abstract::casePrx>& _cpp_else, int event) : + delegate(::std::int32_t _cpp_if, const ::std::optional<::abstract::casePrx>& _cpp_else, ::std::int32_t event) : _cpp_if(_cpp_if), _cpp_else(_cpp_else), event(event) @@ -675,7 +675,7 @@ class delegate : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(_cpp_if, _cpp_else, event); } @@ -686,9 +686,9 @@ class delegate : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int _cpp_if; + ::std::int32_t _cpp_if; ::std::optional<::abstract::casePrx> _cpp_else; - int event; + ::std::int32_t event; }; /// \cond INTERNAL @@ -760,7 +760,7 @@ class fixed : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - fixed(int _cpp_for) : + fixed(::std::int32_t _cpp_for) : _cpp_for(_cpp_for) { } @@ -769,7 +769,7 @@ class fixed : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_for); } @@ -780,7 +780,7 @@ class fixed : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_for; + ::std::int32_t _cpp_for; }; /// \cond INTERNAL @@ -800,7 +800,7 @@ class foreach : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - foreach(int _cpp_for, int _cpp_goto, int _cpp_if) : + foreach(::std::int32_t _cpp_for, ::std::int32_t _cpp_goto, ::std::int32_t _cpp_if) : ::Ice::UserExceptionHelper(_cpp_for), _cpp_goto(_cpp_goto), _cpp_if(_cpp_if) @@ -811,7 +811,7 @@ class foreach : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_for, _cpp_goto, _cpp_if); } @@ -822,8 +822,8 @@ class foreach : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_goto; - int _cpp_if; + ::std::int32_t _cpp_goto; + ::std::int32_t _cpp_if; }; class BaseMethods : public ::Ice::UserExceptionHelper @@ -839,7 +839,7 @@ class BaseMethods : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(Data, HelpLink, InnerException, Message, Source, StackTrace, TargetSite, HResult, Equals, GetBaseException, GetHashCode, GetObjectData, GetType, ReferenceEquals, ToString); } @@ -873,21 +873,21 @@ class BaseMethods : public ::Ice::UserExceptionHelper response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void catchAsync(::std::int32_t checked, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_catch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1140,7 +1140,7 @@ class implicit : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual as in(_cpp_break internal, ::std::shared_ptr is, ::std::optional lock, ::std::optional _cpp_namespace, ::std::optional _cpp_new, ::std::shared_ptr null, int override, int params, int _cpp_private, const ::Ice::Current& current) = 0; + virtual as in(_cpp_break internal, ::std::shared_ptr is, ::std::optional lock, ::std::optional _cpp_namespace, ::std::optional _cpp_new, ::std::shared_ptr null, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_in(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/csharp/test/Slice/macros/Test.h b/slice2cpp/csharp/test/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/csharp/test/Slice/macros/Test.h +++ b/slice2cpp/csharp/test/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/csharp/test/Slice/structure/Test.h b/slice2cpp/csharp/test/Slice/structure/Test.h index c4d4f3e781dd..8ef4e8b73e38 100644 --- a/slice2cpp/csharp/test/Slice/structure/Test.h +++ b/slice2cpp/csharp/test/Slice/structure/Test.h @@ -40,7 +40,7 @@ namespace Test using StringSeq = ::std::vector<::std::string>; -using IntList = ::std::vector; +using IntList = ::std::vector<::std::int32_t>; using StringDict = ::std::map<::std::string, ::std::string>; @@ -66,10 +66,10 @@ struct S1 struct S2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -84,7 +84,7 @@ struct S2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const + std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, ss, il, sd, s, cls, prx); } @@ -118,7 +118,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C(int i) : + explicit C(::std::int32_t i) : i(i) { } @@ -127,7 +127,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -138,7 +138,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.cpp index 4aeeb7be72ac..2d25f8a3bb27 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.cpp @@ -246,30 +246,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -354,30 +354,30 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -387,19 +387,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -410,7 +410,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -458,19 +458,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -481,7 +481,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -685,31 +685,31 @@ Test::TestIntfPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -::Ice::Byte -Test::TestIntfPrx::opByte(::Ice::Byte iceP_b, const ::Ice::Context& context) const +::std::uint8_t +Test::TestIntfPrx::opByte(::std::uint8_t iceP_b, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &TestIntfPrx::_iceI_opByte, iceP_b, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &TestIntfPrx::_iceI_opByte, iceP_b, context).get(); } -::std::future<::Ice::Byte> -Test::TestIntfPrx::opByteAsync(::Ice::Byte iceP_b, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::TestIntfPrx::opByteAsync(::std::uint8_t iceP_b, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &TestIntfPrx::_iceI_opByte, iceP_b, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opByte, iceP_b, context); } ::std::function -Test::TestIntfPrx::opByteAsync(::Ice::Byte iceP_b, - ::std::function response, +Test::TestIntfPrx::opByteAsync(::std::uint8_t iceP_b, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opByte, iceP_b, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opByte, iceP_b, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_b, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opByte_name); outAsync->invoke(iceC_Test_TestIntf_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -721,31 +721,31 @@ Test::TestIntfPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::TestIntfPrx::opShort(short iceP_s, const ::Ice::Context& context) const +::std::int16_t +Test::TestIntfPrx::opShort(::std::int16_t iceP_s, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opShort, iceP_s, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &TestIntfPrx::_iceI_opShort, iceP_s, context).get(); } -::std::future -Test::TestIntfPrx::opShortAsync(short iceP_s, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::TestIntfPrx::opShortAsync(::std::int16_t iceP_s, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opShort, iceP_s, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opShort, iceP_s, context); } ::std::function -Test::TestIntfPrx::opShortAsync(short iceP_s, - ::std::function response, +Test::TestIntfPrx::opShortAsync(::std::int16_t iceP_s, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opShort, iceP_s, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opShort, iceP_s, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_s, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_s, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opShort_name); outAsync->invoke(iceC_Test_TestIntf_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -757,31 +757,31 @@ Test::TestIntfPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::TestIntfPrx::opInt(int iceP_i, const ::Ice::Context& context) const +::std::int32_t +Test::TestIntfPrx::opInt(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opInt, iceP_i, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opInt, iceP_i, context).get(); } -::std::future -Test::TestIntfPrx::opIntAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::TestIntfPrx::opIntAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opInt, iceP_i, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opInt, iceP_i, context); } ::std::function -Test::TestIntfPrx::opIntAsync(int iceP_i, - ::std::function response, +Test::TestIntfPrx::opIntAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opInt, iceP_i, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opInt, iceP_i, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opInt_name); outAsync->invoke(iceC_Test_TestIntf_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -793,31 +793,31 @@ Test::TestIntfPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::TestIntfPrx::opLong(long long int iceP_l, const ::Ice::Context& context) const +::std::int64_t +Test::TestIntfPrx::opLong(::std::int64_t iceP_l, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opLong, iceP_l, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &TestIntfPrx::_iceI_opLong, iceP_l, context).get(); } -::std::future -Test::TestIntfPrx::opLongAsync(long long int iceP_l, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::TestIntfPrx::opLongAsync(::std::int64_t iceP_l, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opLong, iceP_l, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opLong, iceP_l, context); } ::std::function -Test::TestIntfPrx::opLongAsync(long long int iceP_l, - ::std::function response, +Test::TestIntfPrx::opLongAsync(::std::int64_t iceP_l, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opLong, iceP_l, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opLong, iceP_l, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_l, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_l, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opLong_name); outAsync->invoke(iceC_Test_TestIntf_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1010,37 +1010,37 @@ Test::TestIntfControllerPrx::ice_staticId() return TestIntfController::ice_staticId(); } -int -Test::Outer::Inner::TestIntfPrx::op(int iceP_i, int& iceP_j, const ::Ice::Context& context) const +::std::int32_t +Test::Outer::Inner::TestIntfPrx::op(::std::int32_t iceP_i, ::std::int32_t& iceP_j, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); iceP_j = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); } ::std::function -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, - ::std::function response, +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); } /// \cond INTERNAL void -Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Outer_Inner_TestIntf_op_name); outAsync->invoke(iceC_Test_Outer_Inner_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1051,7 +1051,7 @@ Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal: nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1211,7 +1211,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1249,7 +1249,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1263,7 +1263,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -1295,7 +1295,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -1391,10 +1391,10 @@ Test::TestIntf::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_b; + ::std::uint8_t iceP_b; istr->readAll(iceP_b); inS.endReadParams(); - ::Ice::Byte ret = this->opByte(iceP_b, current); + ::std::uint8_t ret = this->opByte(iceP_b, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1408,10 +1408,10 @@ Test::TestIntf::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_s; + ::std::int16_t iceP_s; istr->readAll(iceP_s); inS.endReadParams(); - short ret = this->opShort(iceP_s, current); + ::std::int16_t ret = this->opShort(iceP_s, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1425,10 +1425,10 @@ Test::TestIntf::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int ret = this->opInt(iceP_i, current); + ::std::int32_t ret = this->opInt(iceP_i, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1442,10 +1442,10 @@ Test::TestIntf::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_l; + ::std::int64_t iceP_l; istr->readAll(iceP_l); inS.endReadParams(); - long long int ret = this->opLong(iceP_l, current); + ::std::int64_t ret = this->opLong(iceP_l, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1752,11 +1752,11 @@ Test::Outer::Inner::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int iceP_j; - int ret = this->op(iceP_i, iceP_j, current); + ::std::int32_t iceP_j; + ::std::int32_t ret = this->op(iceP_i, iceP_j, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_j, ret); inS.endWriteParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.h index 1137d49d0a7f..2eb20c7be117 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/ami/Test.h @@ -186,18 +186,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -228,33 +228,33 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -272,19 +272,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -372,64 +372,64 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByteAsync(::Ice::Byte b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByteAsync(::std::uint8_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte b, - ::std::function response, + opByteAsync(::std::uint8_t b, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort(short s, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort(::std::int16_t s, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShortAsync(short s, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShortAsync(::std::int16_t s, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(short s, - ::std::function response, + opShortAsync(::std::int16_t s, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt(int i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIntAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIntAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(int i, - ::std::function response, + opIntAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong(long long int l, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong(::std::int64_t l, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLongAsync(long long int l, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLongAsync(::std::int64_t l, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(long long int l, - ::std::function response, + opLongAsync(::std::int64_t l, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat(float f, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -615,19 +615,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(int i, int& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> opAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(int i, - ::std::function response, + opAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -810,7 +810,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -825,12 +825,12 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -840,7 +840,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -875,22 +875,22 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBool(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte(::Ice::Byte b, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort(short s, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort(::std::int16_t s, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt(int i, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt(::std::int32_t i, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong(long long int l, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong(::std::int64_t l, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1009,11 +1009,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpResult { - int returnValue; - int j; + ::std::int32_t returnValue; + ::std::int32_t j; }; - virtual int op(int i, int& j, const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/background/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/background/Test.cpp index 2740b63ce51d..c50009f0b4c3 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/background/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/background/Test.cpp @@ -327,19 +327,19 @@ Test::BackgroundControllerPrx::_iceI_resumeAdapter(const ::std::shared_ptr<::Ice /// \endcond void -Test::BackgroundControllerPrx::initializeSocketStatus(int iceP_status, const ::Ice::Context& context) const +Test::BackgroundControllerPrx::initializeSocketStatus(::std::int32_t iceP_status, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &BackgroundControllerPrx::_iceI_initializeSocketStatus, iceP_status, context).get(); } ::std::future -Test::BackgroundControllerPrx::initializeSocketStatusAsync(int iceP_status, const ::Ice::Context& context) const +Test::BackgroundControllerPrx::initializeSocketStatusAsync(::std::int32_t iceP_status, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &BackgroundControllerPrx::_iceI_initializeSocketStatus, iceP_status, context); } ::std::function -Test::BackgroundControllerPrx::initializeSocketStatusAsync(int iceP_status, +Test::BackgroundControllerPrx::initializeSocketStatusAsync(::std::int32_t iceP_status, ::std::function response, ::std::function ex, ::std::function sent, @@ -350,7 +350,7 @@ Test::BackgroundControllerPrx::initializeSocketStatusAsync(int iceP_status, /// \cond INTERNAL void -Test::BackgroundControllerPrx::_iceI_initializeSocketStatus(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_status, const ::Ice::Context& context) const +Test::BackgroundControllerPrx::_iceI_initializeSocketStatus(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_status, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_BackgroundController_initializeSocketStatus_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -775,7 +775,7 @@ Test::BackgroundController::_iceD_initializeSocketStatus(::IceInternal::Incoming { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_status; + ::std::int32_t iceP_status; istr->readAll(iceP_status); inS.endReadParams(); this->initializeSocketStatus(iceP_status, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/background/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/background/Test.h index 01552561e054..c01463919cbc 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/background/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/background/Test.h @@ -206,19 +206,19 @@ class BackgroundControllerPrx : public ::Ice::Proxy>&, const ::Ice::Context&) const; /// \endcond - void initializeSocketStatus(int status, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void initializeSocketStatus(::std::int32_t status, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future initializeSocketStatusAsync(int status, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future initializeSocketStatusAsync(::std::int32_t status, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - initializeSocketStatusAsync(int status, + initializeSocketStatusAsync(::std::int32_t status, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_initializeSocketStatus(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_initializeSocketStatus(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void initializeException(bool enable, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -472,7 +472,7 @@ class BackgroundController : public virtual ::Ice::Object bool _iceD_resumeAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void initializeSocketStatus(int status, const ::Ice::Current& current) = 0; + virtual void initializeSocketStatus(::std::int32_t status, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_initializeSocketStatus(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/classLoader/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/classLoader/Test.h index cc4a33a8a9c5..fd905465200f 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/classLoader/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/classLoader/Test.h @@ -160,7 +160,7 @@ class ConcreteClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit ConcreteClass(int i) : + explicit ConcreteClass(::std::int32_t i) : i(i) { } @@ -169,7 +169,7 @@ class ConcreteClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -180,7 +180,7 @@ class ConcreteClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/java/test/src/main/java/test/Ice/custom/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/custom/Test.h index 87322a80c08c..094ebcc6e164 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/custom/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/custom/Test.h @@ -50,13 +50,13 @@ using CList = ::std::vector<::std::shared_ptr>; using BoolSeq = ::std::vector; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -64,13 +64,13 @@ using DoubleSeq = ::std::vector; using StringSeq = ::std::vector<::std::string>; -using ByteBuffer = ::std::vector<::Ice::Byte>; +using ByteBuffer = ::std::vector<::std::uint8_t>; -using ShortBuffer = ::std::vector; +using ShortBuffer = ::std::vector<::std::int16_t>; -using IntBuffer = ::std::vector; +using IntBuffer = ::std::vector<::std::int32_t>; -using LongBuffer = ::std::vector; +using LongBuffer = ::std::vector<::std::int64_t>; using FloatBuffer = ::std::vector; @@ -87,7 +87,7 @@ using ESeq = ::std::vector; using SSeq = ::std::vector; -using D = ::std::map; +using D = ::std::map<::std::int32_t, ::std::string>; using DSeq = ::std::vector; diff --git a/slice2cpp/java/test/src/main/java/test/Ice/defaultValue/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/defaultValue/Test.h index 8c0831962d72..5b9227e1cbfc 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/defaultValue/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/defaultValue/Test.h @@ -70,13 +70,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -96,9 +96,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -108,11 +108,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -123,10 +123,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -137,8 +137,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -148,7 +148,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -157,10 +157,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -170,8 +170,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -181,7 +181,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -189,13 +189,13 @@ struct Struct2 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -204,10 +204,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -221,7 +221,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, is, st, dict); } @@ -255,7 +255,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -279,7 +279,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -292,16 +292,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -328,7 +328,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -343,7 +343,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -465,7 +465,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -489,7 +489,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -502,16 +502,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -535,7 +535,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -550,7 +550,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.cpp index 5cbc3cb5e5f5..77ed4d8ca345 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.cpp @@ -107,19 +107,19 @@ Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsync /// \endcond void -Test::TestIntfPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_to, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -130,7 +130,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -324,7 +324,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.h index eb5f2107e53f..2582f57cb89a 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/dispatcher/Test.h @@ -67,19 +67,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opWithPayload(const ::Ice::ByteSeq& seq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -283,7 +283,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/enums/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/enums/Test.h index 2a0b5da8f18d..83abf5f1e817 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/enums/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp index 3a29c7180fb2..19e5423be660 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp @@ -228,19 +228,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -251,7 +251,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -277,19 +277,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -300,7 +300,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -330,19 +330,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -353,7 +353,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -379,19 +379,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -402,7 +402,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -428,19 +428,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -451,7 +451,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -477,19 +477,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -500,7 +500,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,19 +526,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -549,7 +549,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -575,19 +575,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -598,7 +598,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -610,19 +610,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -633,7 +633,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -645,19 +645,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -668,7 +668,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1098,7 +1098,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1113,7 +1113,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1128,8 +1128,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1144,9 +1144,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1161,8 +1161,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1177,9 +1177,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1194,9 +1194,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1211,7 +1211,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1226,8 +1226,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1242,9 +1242,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.h index 0cf39915c5bf..fd80d198bd6f 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.h @@ -151,154 +151,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -532,7 +532,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -541,7 +541,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -552,7 +552,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -572,7 +572,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -582,7 +582,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -593,7 +593,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -609,7 +609,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -619,7 +619,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -630,7 +630,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -646,7 +646,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -655,7 +655,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -666,7 +666,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -758,52 +758,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.cpp b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.cpp index 5a85af2b5016..0b739b1ed0cc 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.cpp @@ -209,19 +209,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -232,7 +232,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -258,19 +258,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -281,7 +281,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -311,19 +311,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -334,7 +334,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -360,19 +360,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -383,7 +383,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -409,19 +409,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -432,7 +432,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -458,19 +458,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -481,7 +481,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -507,19 +507,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -530,7 +530,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -556,19 +556,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -579,7 +579,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -591,19 +591,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -614,7 +614,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -626,19 +626,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -649,7 +649,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1064,7 +1064,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1079,7 +1079,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1094,8 +1094,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1110,9 +1110,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1127,8 +1127,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1143,9 +1143,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1160,9 +1160,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1177,7 +1177,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1192,8 +1192,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1208,9 +1208,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.h b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.h index 003e6a611e7a..595bae092340 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/TestAMD.h @@ -95,154 +95,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -476,7 +476,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -485,7 +485,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -496,7 +496,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -516,7 +516,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -526,7 +526,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -537,7 +537,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -553,7 +553,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -563,7 +563,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -574,7 +574,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -590,7 +590,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -599,7 +599,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -610,7 +610,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -667,52 +667,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorDAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasAAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasAAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasBAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.cpp index 8c29b5e9015d..88d4a9960180 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.cpp @@ -151,30 +151,30 @@ Test::TestIntfPrx::_iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int +::std::int32_t Test::TestIntfPrx::pid(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_pid, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_pid, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::pidAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_pid, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_pid, context); } ::std::function -Test::TestIntfPrx::pidAsync(::std::function response, +Test::TestIntfPrx::pidAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_pid_name); outAsync->invoke(iceC_Test_TestIntf_pid_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -256,7 +256,7 @@ Test::TestIntf::_iceD_pid(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->pid(current); + ::std::int32_t ret = this->pid(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.h index 252456e2c21b..e1626ef6e479 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/faultTolerance/Test.h @@ -90,18 +90,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - pidAsync(::std::function response, + pidAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -206,7 +206,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_idempotentAbort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int pid(const ::Ice::Current& current) = 0; + virtual ::std::int32_t pid(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_pid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/hash/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/hash/Test.h index b3d8c3dd0d12..db00fae0533e 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/hash/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/hash/Test.h @@ -45,7 +45,7 @@ namespace Test using Points = ::std::vector; -using StringColorMap = ::std::map; +using StringColorMap = ::std::map<::std::int32_t, Color>; } @@ -86,14 +86,14 @@ struct PointD struct Point { - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -115,16 +115,16 @@ struct Polyline struct Color { - int r; - int g; - int b; - int a; + ::std::int32_t r; + ::std::int32_t g; + ::std::int32_t b; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(r, g, b, a); } @@ -188,7 +188,7 @@ class Pen : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Pen(int thickness, const ::Test::Color& color) : + Pen(::std::int32_t thickness, const ::Test::Color& color) : thickness(thickness), color(color) { @@ -198,7 +198,7 @@ class Pen : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(thickness, color); } @@ -209,7 +209,7 @@ class Pen : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int thickness; + ::std::int32_t thickness; ::Test::Color color; }; diff --git a/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.cpp index 1374af4e1e79..ea6e096db329 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.cpp @@ -61,19 +61,19 @@ const ::std::string iceC_Test_Hold_shutdown_name = "shutdown"; } void -Test::HoldPrx::putOnHold(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context).get(); } ::std::future -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context); } ::std::function -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HoldPrx::putOnHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_putOnHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -126,31 +126,31 @@ Test::HoldPrx::_iceI_waitForHold(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::HoldPrx::set(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::int32_t +Test::HoldPrx::set(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); } -::std::future -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } ::std::function -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, - ::std::function response, +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } /// \cond INTERNAL void -Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_delay, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hold_set_name); outAsync->invoke(iceC_Test_Hold_set_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -163,19 +163,19 @@ Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context).get(); } ::std::future -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context); } ::std::function -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -186,7 +186,7 @@ Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, /// \cond INTERNAL void -Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_setOneway_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -265,7 +265,7 @@ Test::Hold::_iceD_putOnHold(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->putOnHold(iceP_seconds, current); @@ -292,11 +292,11 @@ Test::Hold::_iceD_set(::IceInternal::Incoming& inS, const ::Ice::Current& curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_delay; + ::std::int32_t iceP_value; + ::std::int32_t iceP_delay; istr->readAll(iceP_value, iceP_delay); inS.endReadParams(); - int ret = this->set(iceP_value, iceP_delay, current); + ::std::int32_t ret = this->set(iceP_value, iceP_delay, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -310,8 +310,8 @@ Test::Hold::_iceD_setOneway(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_expected; + ::std::int32_t iceP_value; + ::std::int32_t iceP_expected; istr->readAll(iceP_value, iceP_expected); inS.endReadParams(); this->setOneway(iceP_value, iceP_expected, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.h index a3f39ea30458..f0230f6fa5f4 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/hold/Test.h @@ -48,19 +48,19 @@ class HoldPrx : public ::Ice::Proxy { public: - void putOnHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void putOnHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future putOnHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future putOnHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - putOnHoldAsync(int seconds, + putOnHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitForHold(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -77,34 +77,34 @@ class HoldPrx : public ::Ice::Proxy void _iceI_waitForHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int set(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setAsync(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> setAsync(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setAsync(int value, int delay, - ::std::function response, + setAsync(::std::int32_t value, ::std::int32_t delay, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void setOneway(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setOnewayAsync(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setOnewayAsync(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setOnewayAsync(int value, int expected, + setOnewayAsync(::std::int32_t value, ::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -208,7 +208,7 @@ class Hold : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void putOnHold(int seconds, const ::Ice::Current& current) = 0; + virtual void putOnHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_putOnHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -218,12 +218,12 @@ class Hold : public virtual ::Ice::Object bool _iceD_waitForHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int set(int value, int delay, const ::Ice::Current& current) = 0; + virtual ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_set(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void setOneway(int value, int expected, const ::Ice::Current& current) = 0; + virtual void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.cpp index 331d19fd4ddd..e2cfab69b858 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.cpp @@ -72,31 +72,31 @@ const ::std::string iceC_Test_MyObject_amdBadSystemAdd_name = "amdBadSystemAdd"; } -int -Test::MyObjectPrx::add(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::add(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_add_name); outAsync->invoke(iceC_Test_MyObject_add_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -108,31 +108,31 @@ Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyn } /// \endcond -int -Test::MyObjectPrx::addWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::addWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_addWithRetry_name); outAsync->invoke(iceC_Test_MyObject_addWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -144,31 +144,31 @@ Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::badAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badAdd_name); outAsync->invoke(iceC_Test_MyObject_badAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -193,31 +193,31 @@ Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::notExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::notExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_notExistAdd_name); outAsync->invoke(iceC_Test_MyObject_notExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -229,31 +229,31 @@ Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::Outg } /// \endcond -int -Test::MyObjectPrx::badSystemAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badSystemAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badSystemAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badSystemAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badSystemAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badSystemAdd_name); outAsync->invoke(iceC_Test_MyObject_badSystemAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -265,31 +265,31 @@ Test::MyObjectPrx::_iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::amdAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAdd_name); outAsync->invoke(iceC_Test_MyObject_amdAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -301,31 +301,31 @@ Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::amdAddWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAddWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAddWithRetry_name); outAsync->invoke(iceC_Test_MyObject_amdAddWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -337,31 +337,31 @@ Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int -Test::MyObjectPrx::amdBadAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -386,31 +386,31 @@ Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::Outgoi } /// \endcond -int -Test::MyObjectPrx::amdNotExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdNotExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdNotExistAdd_name); outAsync->invoke(iceC_Test_MyObject_amdNotExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -422,31 +422,31 @@ Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::O } /// \endcond -int -Test::MyObjectPrx::amdBadSystemAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadSystemAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadSystemAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadSystemAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadSystemAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadSystemAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadSystemAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadSystemAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,11 +506,11 @@ Test::MyObject::_iceD_add(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->add(iceP_x, iceP_y, current); + ::std::int32_t ret = this->add(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -524,11 +524,11 @@ Test::MyObject::_iceD_addWithRetry(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->addWithRetry(iceP_x, iceP_y, current); + ::std::int32_t ret = this->addWithRetry(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -542,11 +542,11 @@ Test::MyObject::_iceD_badAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -560,11 +560,11 @@ Test::MyObject::_iceD_notExistAdd(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->notExistAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->notExistAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -578,11 +578,11 @@ Test::MyObject::_iceD_badSystemAdd(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badSystemAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badSystemAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -596,12 +596,12 @@ Test::MyObject::_iceD_amdAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -619,12 +619,12 @@ Test::MyObject::_iceD_amdAddWithRetry(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -642,12 +642,12 @@ Test::MyObject::_iceD_amdBadAdd(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -665,12 +665,12 @@ Test::MyObject::_iceD_amdNotExistAdd(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -688,12 +688,12 @@ Test::MyObject::_iceD_amdBadSystemAdd(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.h index 617bd2dd921a..889d6a20d6c7 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/interceptor/Test.h @@ -48,154 +48,154 @@ class MyObjectPrx : public ::Ice::Proxy { public: - int add(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addAsync(int x, int y, - ::std::function response, + addAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int addWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addWithRetryAsync(int x, int y, - ::std::function response, + addWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badAddAsync(int x, int y, - ::std::function response, + badAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int notExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future notExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> notExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - notExistAddAsync(int x, int y, - ::std::function response, + notExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badSystemAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badSystemAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badSystemAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badSystemAddAsync(int x, int y, - ::std::function response, + badSystemAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddAsync(int x, int y, - ::std::function response, + amdAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAddWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAddWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddWithRetryAsync(int x, int y, - ::std::function response, + amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadAddAsync(int x, int y, - ::std::function response, + amdBadAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdNotExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdNotExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdNotExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdNotExistAddAsync(int x, int y, - ::std::function response, + amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadSystemAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadSystemAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadSystemAddAsync(int x, int y, - ::std::function response, + amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadSystemAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -330,52 +330,52 @@ class MyObject : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual int add(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_add(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int addWithRetry(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_addWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int notExistAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_notExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badSystemAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badSystemAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badSystemAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddWithRetryAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAddWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdNotExistAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdNotExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadSystemAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadSystemAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadSystemAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.cpp index 61b0d6c05ee3..b4310ab60f2d 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.cpp @@ -146,19 +146,19 @@ Test::TestIntfPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::Out /// \endcond void -Test::TestIntfPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_to, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -169,7 +169,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_sleep_name); outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -456,7 +456,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.h index 66e1a0ff31da..ead3d0aa39f8 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/interrupt/Test.h @@ -81,19 +81,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opWithPayload(const ::Ice::ByteSeq& seq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -377,7 +377,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/location/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/location/Test.cpp index 457a88f7cfee..f59447f9b4eb 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/location/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/location/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/location/Test.h index 54689962018c..5e6f07b7aa2d 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/location/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/metrics/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/metrics/Test.h index 8ec1cb42d2fe..62b91201fe9e 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/metrics/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/metrics/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/metrics/TestAMD.h b/slice2cpp/java/test/src/main/java/test/Ice/metrics/TestAMD.h index 1d479033bd3b..defcbd6db996 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/metrics/TestAMD.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/metrics/TestAMD.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/objects/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/objects/Test.h index dfbd6b5d5757..9e5aa44a066b 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/objects/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/objects/Test.h @@ -98,7 +98,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -116,9 +116,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -837,14 +837,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1127,7 +1127,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1137,7 +1137,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1150,7 +1150,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.cpp index df3c1aad22da..7225c2bbd55d 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.cpp @@ -464,37 +464,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -505,7 +505,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -560,39 +560,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -603,7 +603,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2561,30 +2561,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2722,31 +2722,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2758,31 +2758,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2794,31 +2794,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2830,31 +2830,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3631,12 +3631,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3669,15 +3669,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4472,7 +4472,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4540,10 +4540,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4557,10 +4557,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4574,10 +4574,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4591,10 +4591,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.h index e46c75b36f30..3a8df6f895ca 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -108,11 +108,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -136,15 +136,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -285,19 +285,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -315,19 +315,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -945,18 +945,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1016,64 +1016,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1556,14 +1556,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1703,11 +1703,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1731,13 +1731,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2306,7 +2306,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2331,22 +2331,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.cpp b/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.cpp index c86848d69866..5dbd2877be1a 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.cpp @@ -379,37 +379,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,7 +420,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -475,39 +475,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -518,7 +518,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2476,30 +2476,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2637,31 +2637,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2673,31 +2673,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2709,31 +2709,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2745,31 +2745,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3545,12 +3545,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret, ::Ice::Byte iceP_p3) + auto responseCB = [inA](::std::uint8_t ret, ::std::uint8_t iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p3, ret); @@ -3591,13 +3591,13 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret, short iceP_p4, int iceP_p5, long long int iceP_p6) + auto responseCB = [inA](::std::int64_t ret, ::std::int16_t iceP_p4, ::std::int32_t iceP_p5, ::std::int64_t iceP_p6) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); @@ -4550,7 +4550,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4627,11 +4627,11 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret) + auto responseCB = [inA](::std::uint8_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4649,11 +4649,11 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](short ret) + auto responseCB = [inA](::std::int16_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4671,11 +4671,11 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4693,11 +4693,11 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret) + auto responseCB = [inA](::std::int64_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.h b/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.h index bc2a2992c64b..d70e5e225e49 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/operations/TestAMD.h @@ -56,15 +56,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -98,11 +98,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -126,15 +126,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -270,19 +270,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -300,19 +300,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -930,18 +930,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1001,64 +1001,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1471,14 +1471,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1618,11 +1618,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual void opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1646,13 +1646,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual void opShortIntLongAsync(short p1, int p2, long long int p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2221,7 +2221,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2246,22 +2246,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByte1Async(::Ice::Byte opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByte1Async(::std::uint8_t opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opShort1Async(short opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShort1Async(::std::int16_t opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opInt1Async(int opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opInt1Async(::std::int32_t opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opLong1Async(long long int opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLong1Async(::std::int64_t opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.cpp index 58d2db979b05..b7aa206ee774 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.cpp @@ -380,19 +380,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -403,7 +403,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -429,19 +429,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -452,7 +452,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -478,19 +478,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -501,7 +501,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,37 +526,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -567,44 +567,44 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByteReq(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByteReq(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteReqAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteReqAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteReqAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteReqAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByteReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByteReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByteReq_name); outAsync->invoke(iceC_Test_Initial_opByteReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -615,7 +615,7 @@ Test::InitialPrx::_iceI_opByteReq(const ::std::shared_ptr<::IceInternal::Outgoin nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -718,37 +718,37 @@ Test::InitialPrx::_iceI_opBoolReq(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -759,44 +759,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opShortReq(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShortReq(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortReqAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortReqAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortReqAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortReqAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShortReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShortReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShortReq_name); outAsync->invoke(iceC_Test_Initial_opShortReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -807,44 +807,44 @@ Test::InitialPrx::_iceI_opShortReq(const ::std::shared_ptr<::IceInternal::Outgoi nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -855,44 +855,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opIntReq(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opIntReq(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntReqAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntReqAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntReqAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntReqAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opIntReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opIntReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opIntReq_name); outAsync->invoke(iceC_Test_Initial_opIntReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -903,44 +903,44 @@ Test::InitialPrx::_iceI_opIntReq(const ::std::shared_ptr<::IceInternal::Outgoing nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -951,44 +951,44 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLongReq(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLongReq(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongReqAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongReqAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongReqAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongReqAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLongReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLongReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLongReq_name); outAsync->invoke(iceC_Test_Initial_opLongReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -999,7 +999,7 @@ Test::InitialPrx::_iceI_opLongReq(const ::std::shared_ptr<::IceInternal::Outgoin nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -4549,7 +4549,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -4566,7 +4566,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -4583,7 +4583,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -4600,11 +4600,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -4618,11 +4618,11 @@ Test::Initial::_iceD_opByteReq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByteReq(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByteReq(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -4672,11 +4672,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -4690,11 +4690,11 @@ Test::Initial::_iceD_opShortReq(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShortReq(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShortReq(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -4708,11 +4708,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -4726,11 +4726,11 @@ Test::Initial::_iceD_opIntReq(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opIntReq(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opIntReq(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -4744,11 +4744,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); @@ -4762,11 +4762,11 @@ Test::Initial::_iceD_opLongReq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLongReq(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLongReq(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.h index f1a83928ff01..10e045e91f06 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/optional/Test.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,21 +97,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -219,79 +219,79 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByteReq(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByteReq(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteReqAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteReqAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteReqAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteReqAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -324,94 +324,94 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBoolReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opShortReq(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShortReq(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortReqAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortReqAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortReqAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortReqAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opIntReq(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opIntReq(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntReqAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntReqAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntReqAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntReqAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLongReq(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLongReq(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongReqAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongReqAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongReqAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongReqAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1509,13 +1509,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1523,13 +1523,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1551,13 +1551,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1591,7 +1591,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1600,7 +1600,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1611,7 +1611,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1634,7 +1634,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1672,7 +1672,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1683,11 +1683,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1731,7 +1731,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1743,7 +1743,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1754,10 +1754,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1776,7 +1776,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1787,7 +1787,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1811,8 +1811,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1837,7 +1837,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1848,7 +1848,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1879,7 +1879,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1889,7 +1889,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1900,7 +1900,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -2094,7 +2094,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -2103,7 +2103,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -2114,7 +2114,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -2219,7 +2219,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -2231,7 +2231,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -2243,7 +2243,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -2265,7 +2265,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -2278,7 +2278,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -2308,7 +2308,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -2319,7 +2319,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2431,17 +2431,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2451,11 +2451,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2465,11 +2465,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteReqResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByteReq(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByteReq(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2507,11 +2507,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2521,11 +2521,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortReqResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShortReq(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShortReq(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2535,11 +2535,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2549,11 +2549,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntReqResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opIntReq(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opIntReq(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIntReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2563,11 +2563,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2577,11 +2577,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongReqResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLongReq(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLongReq(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLongReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.cpp b/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.cpp index 6c3fb04cf0ab..5b136b75eaa3 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.cpp @@ -380,19 +380,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -403,7 +403,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -429,19 +429,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -452,7 +452,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -478,19 +478,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -501,7 +501,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,37 +526,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -567,44 +567,44 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByteReq(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByteReq(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteReqAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteReqAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteReqAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteReqAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByteReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByteReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByteReq_name); outAsync->invoke(iceC_Test_Initial_opByteReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -615,7 +615,7 @@ Test::InitialPrx::_iceI_opByteReq(const ::std::shared_ptr<::IceInternal::Outgoin nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -718,37 +718,37 @@ Test::InitialPrx::_iceI_opBoolReq(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -759,44 +759,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opShortReq(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShortReq(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortReqAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortReqAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortReqAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortReqAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShortReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShortReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShortReq_name); outAsync->invoke(iceC_Test_Initial_opShortReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -807,44 +807,44 @@ Test::InitialPrx::_iceI_opShortReq(const ::std::shared_ptr<::IceInternal::Outgoi nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -855,44 +855,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opIntReq(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opIntReq(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntReqAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntReqAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntReqAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntReqAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opIntReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opIntReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opIntReq_name); outAsync->invoke(iceC_Test_Initial_opIntReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -903,44 +903,44 @@ Test::InitialPrx::_iceI_opIntReq(const ::std::shared_ptr<::IceInternal::Outgoing nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -951,44 +951,44 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLongReq(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLongReq(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongReqAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongReqAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongReq, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongReqAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongReqAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLongReq, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLongReq, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLongReq_name); outAsync->invoke(iceC_Test_Initial_opLongReq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -999,7 +999,7 @@ Test::InitialPrx::_iceI_opLongReq(const ::std::shared_ptr<::IceInternal::Outgoin nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -4554,7 +4554,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -4571,7 +4571,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -4588,7 +4588,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -4605,11 +4605,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::Ice::Byte>& ret, const std::optional<::Ice::Byte>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::uint8_t>& ret, const std::optional<::std::uint8_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -4627,11 +4627,11 @@ Test::Initial::_iceD_opByteReq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::Ice::Byte>& ret, const std::optional<::Ice::Byte>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::uint8_t>& ret, const std::optional<::std::uint8_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -4693,11 +4693,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int16_t>& ret, const std::optional<::std::int16_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -4715,11 +4715,11 @@ Test::Initial::_iceD_opShortReq(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int16_t>& ret, const std::optional<::std::int16_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -4737,11 +4737,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int32_t>& ret, const std::optional<::std::int32_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -4759,11 +4759,11 @@ Test::Initial::_iceD_opIntReq(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int32_t>& ret, const std::optional<::std::int32_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -4781,11 +4781,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int64_t>& ret, const std::optional<::std::int64_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); @@ -4803,11 +4803,11 @@ Test::Initial::_iceD_opLongReq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int64_t>& ret, const std::optional<::std::int64_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.h b/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.h index 84a46aafbbea..20ca78ee3259 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/optional/TestAMD.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,21 +97,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -219,79 +219,79 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByteReq(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByteReq(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteReqAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteReqAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteReqAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteReqAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByteReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -324,94 +324,94 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBoolReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opShortReq(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShortReq(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortReqAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortReqAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortReqAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortReqAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShortReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opIntReq(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opIntReq(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntReqAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntReqAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntReqAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntReqAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opIntReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLongReq(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLongReq(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongReqAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongReqAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongReqAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongReqAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLongReq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1509,13 +1509,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1523,13 +1523,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1551,13 +1551,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1591,7 +1591,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1600,7 +1600,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1611,7 +1611,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1634,7 +1634,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1672,7 +1672,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1683,11 +1683,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1731,7 +1731,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1743,7 +1743,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1754,10 +1754,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1776,7 +1776,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1787,7 +1787,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1811,8 +1811,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1837,7 +1837,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1848,7 +1848,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1879,7 +1879,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1889,7 +1889,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1900,7 +1900,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -2094,7 +2094,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -2103,7 +2103,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -2114,7 +2114,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -2219,7 +2219,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -2231,7 +2231,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -2243,7 +2243,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -2265,7 +2265,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -2278,7 +2278,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -2308,7 +2308,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -2319,7 +2319,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2431,17 +2431,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opOptionalExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opDerivedExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opRequiredExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2451,11 +2451,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual void opByteAsync(std::optional<::Ice::Byte> p1, ::std::function& returnValue, const std::optional<::Ice::Byte>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(std::optional<::std::uint8_t> p1, ::std::function& returnValue, const std::optional<::std::uint8_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2465,11 +2465,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteReqResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual void opByteReqAsync(std::optional<::Ice::Byte> p1, ::std::function& returnValue, const std::optional<::Ice::Byte>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteReqAsync(std::optional<::std::uint8_t> p1, ::std::function& returnValue, const std::optional<::std::uint8_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2507,11 +2507,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual void opShortAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortAsync(std::optional<::std::int16_t> p1, ::std::function& returnValue, const std::optional<::std::int16_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2521,11 +2521,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortReqResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual void opShortReqAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortReqAsync(std::optional<::std::int16_t> p1, ::std::function& returnValue, const std::optional<::std::int16_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2535,11 +2535,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual void opIntAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opIntAsync(std::optional<::std::int32_t> p1, ::std::function& returnValue, const std::optional<::std::int32_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2549,11 +2549,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntReqResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual void opIntReqAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opIntReqAsync(std::optional<::std::int32_t> p1, ::std::function& returnValue, const std::optional<::std::int32_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIntReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2563,11 +2563,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual void opLongAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLongAsync(std::optional<::std::int64_t> p1, ::std::function& returnValue, const std::optional<::std::int64_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2577,11 +2577,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongReqResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual void opLongReqAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLongReqAsync(std::optional<::std::int64_t> p1, ::std::function& returnValue, const std::optional<::std::int64_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLongReq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/packagemd/NoPackage.h b/slice2cpp/java/test/src/main/java/test/Ice/packagemd/NoPackage.h index eb106eaff432..aa0fd6a89c1e 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/packagemd/NoPackage.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/packagemd/NoPackage.h @@ -58,7 +58,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -67,7 +67,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -78,7 +78,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -101,7 +101,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -111,7 +111,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -122,7 +122,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -143,7 +143,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -152,7 +152,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -163,7 +163,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -183,7 +183,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -193,7 +193,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -204,7 +204,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; /** @@ -223,7 +223,7 @@ class notify : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - notify(int i) : + notify(::std::int32_t i) : i(i) { } @@ -232,7 +232,7 @@ class notify : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -243,7 +243,7 @@ class notify : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/packagemd/Package.h b/slice2cpp/java/test/src/main/java/test/Ice/packagemd/Package.h index 6fa1feed5c72..6a2bca3a7141 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/packagemd/Package.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/packagemd/Package.h @@ -71,7 +71,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -80,7 +80,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -91,7 +91,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -114,7 +114,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -124,7 +124,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -135,7 +135,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -159,7 +159,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -168,7 +168,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -179,7 +179,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class C2 : public ::Ice::ValueHelper @@ -198,7 +198,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -208,7 +208,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -219,7 +219,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -240,7 +240,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -249,7 +249,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -260,7 +260,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -280,7 +280,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -290,7 +290,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -301,7 +301,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -322,7 +322,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -331,7 +331,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -342,7 +342,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class E2 : public ::Ice::UserExceptionHelper @@ -358,7 +358,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -368,7 +368,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -379,7 +379,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.cpp index ee86b069d353..861ae2bfa6b8 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.cpp @@ -97,31 +97,31 @@ Test::RetryPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); } -::std::future -Test::RetryPrx::opIdempotentAsync(int iceP_c, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); } ::std::function -Test::RetryPrx::opIdempotentAsync(int iceP_c, - ::std::function response, +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); } /// \cond INTERNAL void -Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_c, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Retry_opIdempotent_name); outAsync->invoke(iceC_Test_Retry_opIdempotent_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -196,19 +196,19 @@ Test::RetryPrx::_iceI_opSystemException(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::RetryPrx::sleep(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleep(::std::int32_t iceP_delay, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &RetryPrx::_iceI_sleep, iceP_delay, context).get(); } ::std::future -Test::RetryPrx::sleepAsync(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_sleep, iceP_delay, context); } ::std::function -Test::RetryPrx::sleepAsync(int iceP_delay, +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, ::std::function response, ::std::function ex, ::std::function sent, @@ -219,7 +219,7 @@ Test::RetryPrx::sleepAsync(int iceP_delay, /// \cond INTERNAL void -Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Retry_sleep_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -313,10 +313,10 @@ Test::Retry::_iceD_opIdempotent(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_c; + ::std::int32_t iceP_c; istr->readAll(iceP_c); inS.endReadParams(); - int ret = this->opIdempotent(iceP_c, current); + ::std::int32_t ret = this->opIdempotent(iceP_c, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -354,7 +354,7 @@ Test::Retry::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& cur { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_delay; + ::std::int32_t iceP_delay; istr->readAll(iceP_delay); inS.endReadParams(); this->sleep(iceP_delay, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.h index 5c5ba2348735..e76f1fbe7a00 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/retry/Test.h @@ -63,19 +63,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - int opIdempotent(int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIdempotentAsync(int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIdempotentAsync(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIdempotentAsync(int c, - ::std::function response, + opIdempotentAsync(::std::int32_t c, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opNotIdempotent(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -106,19 +106,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_opSystemException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int delay, + sleepAsync(::std::int32_t delay, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -227,7 +227,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opIdempotent(int c, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -242,7 +242,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_opSystemException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int delay, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/scope/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/scope/Test.h index d2dbb755684c..9ebc4e11d311 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/scope/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/Test.h index 546cd9998e4c..9ab2fe0bf8e6 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/Test.h @@ -41,19 +41,19 @@ class Baz; namespace Test { -using SerialSmall = ::std::vector<::Ice::Byte>; +using SerialSmall = ::std::vector<::std::uint8_t>; -using SerialLarge = ::std::vector<::Ice::Byte>; +using SerialLarge = ::std::vector<::std::uint8_t>; -using SerialStruct = ::std::vector<::Ice::Byte>; +using SerialStruct = ::std::vector<::std::uint8_t>; using SLS = ::std::vector; using SLSS = ::std::vector; -using SLD = ::std::map; +using SLD = ::std::map<::std::int32_t, SerialLarge>; -using SLSD = ::std::map; +using SLSD = ::std::map<::std::int32_t, SLS>; } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/TestAMD.h b/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/TestAMD.h index dae72836dd57..56fddbeb60aa 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/TestAMD.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/seqMapping/TestAMD.h @@ -41,19 +41,19 @@ class Baz; namespace Test { -using SerialSmall = ::std::vector<::Ice::Byte>; +using SerialSmall = ::std::vector<::std::uint8_t>; -using SerialLarge = ::std::vector<::Ice::Byte>; +using SerialLarge = ::std::vector<::std::uint8_t>; -using SerialStruct = ::std::vector<::Ice::Byte>; +using SerialStruct = ::std::vector<::std::uint8_t>; using SLS = ::std::vector; using SLSS = ::std::vector; -using SLD = ::std::map; +using SLD = ::std::map<::std::int32_t, SerialLarge>; -using SLSD = ::std::map; +using SLSD = ::std::map<::std::int32_t, SLS>; } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/serialize/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/serialize/Test.h index dfd747aa0291..4b4d3c6d57f3 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/serialize/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/serialize/Test.h @@ -49,17 +49,17 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; using MyEnumS = ::std::vector; using BaseS = ::std::vector<::std::shared_ptr>; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; using StringMyEnumD = ::std::map<::std::string, MyEnum>; @@ -186,10 +186,10 @@ namespace Test struct Struct1 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -200,7 +200,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, p); } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.h index 66b3ca39a43f..8896cf8397ab 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.h @@ -61,7 +61,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -958,7 +958,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -967,7 +967,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -978,7 +978,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -997,7 +997,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1007,7 +1007,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1056,7 +1056,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1066,7 +1066,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1096,7 +1096,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1106,7 +1106,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1236,7 +1236,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -1246,7 +1246,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -1295,7 +1295,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1305,7 +1305,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -1335,7 +1335,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -1345,7 +1345,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -1356,7 +1356,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -1375,7 +1375,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -1385,7 +1385,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -1415,7 +1415,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1425,7 +1425,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.h b/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.h index 0f3edcd19aaf..3e7baed5032b 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.h @@ -62,7 +62,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -959,7 +959,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -968,7 +968,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -979,7 +979,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -998,7 +998,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1008,7 +1008,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1057,7 +1057,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1067,7 +1067,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1097,7 +1097,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1107,7 +1107,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1360,7 +1360,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -1369,7 +1369,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1380,7 +1380,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -1399,7 +1399,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -1411,7 +1411,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -1443,7 +1443,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1453,7 +1453,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.h b/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.h index 2371cf5ef7d1..4901cbc90bd2 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.h @@ -61,7 +61,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -958,7 +958,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -967,7 +967,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -978,7 +978,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -997,7 +997,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1007,7 +1007,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1056,7 +1056,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1066,7 +1066,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1319,7 +1319,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -1328,7 +1328,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -1339,7 +1339,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -1358,7 +1358,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -1370,7 +1370,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -1402,7 +1402,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1412,7 +1412,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/java/test/src/main/java/test/Ice/stream/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/stream/Test.h index 3a8ea6c123d6..79d7dca06708 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/stream/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/stream/Test.h @@ -52,15 +52,15 @@ enum class MyEnum : unsigned char enum3 }; -using SerialSmall = ::std::vector<::Ice::Byte>; +using SerialSmall = ::std::vector<::std::uint8_t>; using MyEnumS = ::std::vector; using MyClassS = ::std::vector<::std::shared_ptr>; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; using StringMyClassD = ::std::map<::std::string, ::std::shared_ptr>; @@ -84,7 +84,7 @@ using MyEnumSS = ::std::vector; using MyClassSS = ::std::vector; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -153,10 +153,10 @@ namespace Test struct SmallStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -169,7 +169,7 @@ struct SmallStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::optional<::Test::MyInterfacePrx>&, const ::Test::SerialSmall&> ice_tuple() const + std::tuple&, const ::std::optional<::Test::MyInterfacePrx>&, const ::Test::SerialSmall&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, c, p, ss); } @@ -177,14 +177,14 @@ struct SmallStruct struct Point { - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -218,7 +218,7 @@ class OptionalClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - OptionalClass(bool bo, ::Ice::Byte by, const std::optional& sh, const std::optional& i, const std::optional<::Test::SmallStruct>& sm, const std::optional<::Test::MyEnumS>& enumS4, const std::optional<::Test::MyClassS>& myClassS5, const std::optional<::Test::ByteBoolD>& byteBoolD6, const std::optional<::Test::ShortIntD>& shortIntD7, const std::optional<::Test::MyEnum>& enum8, const std::optional<::std::shared_ptr<::Test::MyClass>>& class9, const std::optional<::Test::StringMyClassD>& stringMyClassD10, const std::optional<::Ice::IntSeq>& intSeq12, const std::optional<::Ice::ByteSeq>& byteSeq13, const std::optional<::Ice::StringSeq>& stringSeq14, const std::optional<::Test::Point>& p15) : + OptionalClass(bool bo, ::std::uint8_t by, const std::optional<::std::int16_t>& sh, const std::optional<::std::int32_t>& i, const std::optional<::Test::SmallStruct>& sm, const std::optional<::Test::MyEnumS>& enumS4, const std::optional<::Test::MyClassS>& myClassS5, const std::optional<::Test::ByteBoolD>& byteBoolD6, const std::optional<::Test::ShortIntD>& shortIntD7, const std::optional<::Test::MyEnum>& enum8, const std::optional<::std::shared_ptr<::Test::MyClass>>& class9, const std::optional<::Test::StringMyClassD>& stringMyClassD10, const std::optional<::Ice::IntSeq>& intSeq12, const std::optional<::Ice::ByteSeq>& byteSeq13, const std::optional<::Ice::StringSeq>& stringSeq14, const std::optional<::Test::Point>& p15) : bo(bo), by(by), sh(sh), @@ -242,7 +242,7 @@ class OptionalClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional<::Test::SmallStruct>&, const std::optional<::Test::MyEnumS>&, const std::optional<::Test::MyClassS>&, const std::optional<::Test::ByteBoolD>&, const std::optional<::Test::ShortIntD>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::shared_ptr<::Test::MyClass>>&, const std::optional<::Test::StringMyClassD>&, const std::optional<::Ice::IntSeq>&, const std::optional<::Ice::ByteSeq>&, const std::optional<::Ice::StringSeq>&, const std::optional<::Test::Point>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::Test::SmallStruct>&, const std::optional<::Test::MyEnumS>&, const std::optional<::Test::MyClassS>&, const std::optional<::Test::ByteBoolD>&, const std::optional<::Test::ShortIntD>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::shared_ptr<::Test::MyClass>>&, const std::optional<::Test::StringMyClassD>&, const std::optional<::Ice::IntSeq>&, const std::optional<::Ice::ByteSeq>&, const std::optional<::Ice::StringSeq>&, const std::optional<::Test::Point>&> ice_tuple() const { return std::tie(bo, by, sh, i, sm, enumS4, myClassS5, byteBoolD6, shortIntD7, enum8, class9, stringMyClassD10, intSeq12, byteSeq13, stringSeq14, p15); } @@ -254,9 +254,9 @@ class OptionalClass : public ::Ice::ValueHelper static const ::std::string& ice_staticId(); bool bo; - ::Ice::Byte by; - std::optional sh; - std::optional i; + ::std::uint8_t by; + std::optional<::std::int16_t> sh; + std::optional<::std::int32_t> i; std::optional<::Test::SmallStruct> sm; std::optional<::Test::MyEnumS> enumS4; std::optional<::Test::MyClassS> myClassS5; diff --git a/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.cpp index 778f5f92442a..92dd129cb393 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.cpp @@ -85,30 +85,30 @@ Test::PriorityPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -int +::std::int32_t Test::PriorityPrx::getPriority(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &PriorityPrx::_iceI_getPriority, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &PriorityPrx::_iceI_getPriority, context).get(); } -::std::future +::std::future<::std::int32_t> Test::PriorityPrx::getPriorityAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &PriorityPrx::_iceI_getPriority, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &PriorityPrx::_iceI_getPriority, context); } ::std::function -Test::PriorityPrx::getPriorityAsync(::std::function response, +Test::PriorityPrx::getPriorityAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::PriorityPrx::_iceI_getPriority, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::PriorityPrx::_iceI_getPriority, context); } /// \cond INTERNAL void -Test::PriorityPrx::_iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::PriorityPrx::_iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Priority_getPriority_name); outAsync->invoke(iceC_Test_Priority_getPriority_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -166,7 +166,7 @@ Test::Priority::_iceD_getPriority(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getPriority(current); + ::std::int32_t ret = this->getPriority(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.h index e6436cf56f4f..69ee10c8b212 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/threadPoolPriority/Test.h @@ -62,18 +62,18 @@ class PriorityPrx : public ::Ice::Proxy void _iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int getPriority(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getPriority(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getPriorityAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getPriorityAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getPriorityAsync(::std::function response, + getPriorityAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getPriority(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -168,7 +168,7 @@ class Priority : public virtual ::Ice::Object bool _iceD_shutdown(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getPriority(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getPriority(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getPriority(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.cpp +++ b/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Ice/udp/Test.h b/slice2cpp/java/test/src/main/java/test/Ice/udp/Test.h index 16a1964952de..227d33e6ee6f 100644 --- a/slice2cpp/java/test/src/main/java/test/Ice/udp/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Ice/udp/Test.h @@ -44,7 +44,7 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.cpp b/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.cpp index d54b5cb2b753..6b831f07f770 100644 --- a/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.cpp +++ b/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.cpp @@ -389,19 +389,19 @@ Clash::IntfPrx::_iceI_obj(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT< /// \endcond void -Clash::IntfPrx::op(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::op(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &IntfPrx::_iceI_op, iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, context).get(); } ::std::future -Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &IntfPrx::_iceI_op, iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, context); } ::std::function -Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, +Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, ::std::function response, ::std::function ex, ::std::function sent, @@ -412,7 +412,7 @@ Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& /// \cond INTERNAL void -Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { outAsync->invoke(iceC_Clash_Intf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -425,9 +425,9 @@ Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT& iceP_proxy, std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::opOut(::std::string& iceP_context, ::std::string& iceP_current, ::std::string& iceP_response, ::std::string& iceP_ex, ::std::string& iceP_sent, ::std::string& iceP_cookie, ::std::string& iceP_sync, ::std::string& iceP_result, ::std::string& iceP_istr, ::std::string& iceP_ostr, std::optional<::std::string>& iceP_proxy, std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>(true, this, &IntfPrx::_iceI_opOut, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>(true, this, &IntfPrx::_iceI_opOut, context).get(); iceP_context = ::std::move(::std::get<0>(_result)); iceP_current = ::std::move(::std::get<1>(_result)); iceP_response = ::std::move(::std::get<2>(_result)); @@ -442,28 +442,28 @@ Clash::IntfPrx::opOut(::std::string& iceP_context, ::std::string& iceP_current, iceP_obj = ::std::get<11>(_result); } -::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>> +::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>> Clash::IntfPrx::opOutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>, ::std::promise>(false, this, &IntfPrx::_iceI_opOut, context); + return _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>, ::std::promise>(false, this, &IntfPrx::_iceI_opOut, context); } ::std::function -Clash::IntfPrx::opOutAsync(::std::function, std::optional)> response, +Clash::IntfPrx::opOutAsync(::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>&& _result) + auto _responseCb = [response](::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result)), ::std::move(::std::get<2>(_result)), ::std::move(::std::get<3>(_result)), ::std::move(::std::get<4>(_result)), ::std::move(::std::get<5>(_result)), ::std::move(::std::get<6>(_result)), ::std::move(::std::get<7>(_result)), ::std::move(::std::get<8>(_result)), ::std::move(::std::get<9>(_result)), ::std::move(::std::get<10>(_result)), ::std::get<11>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Clash::IntfPrx::_iceI_opOut, context); + return _makeLambdaOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Clash::IntfPrx::_iceI_opOut, context); } /// \cond INTERNAL void -Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>>& outAsync, const ::Ice::Context& context) const +Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Clash_Intf_opOut_name); outAsync->invoke(iceC_Clash_Intf_opOut_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -471,7 +471,7 @@ Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsync nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional> v; + ::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>> v; istr->readAll(::std::get<0>(v), ::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<4>(v), ::std::get<5>(v), ::std::get<6>(v), ::std::get<7>(v), ::std::get<8>(v), ::std::get<9>(v)); istr->readAll({1, 2}, ::std::get<10>(v), ::std::get<11>(v)); return v; @@ -669,7 +669,7 @@ Clash::Intf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice::Current& curren ::std::string iceP_istr; ::std::string iceP_ostr; std::optional<::std::string> iceP_proxy; - std::optional iceP_obj; + std::optional<::std::int32_t> iceP_obj; istr->readAll(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr); istr->readAll({1, 2}, iceP_proxy, iceP_obj); inS.endReadParams(); @@ -696,7 +696,7 @@ Clash::Intf::_iceD_opOut(::IceInternal::Incoming& inS, const ::Ice::Current& cur ::std::string iceP_istr; ::std::string iceP_ostr; std::optional<::std::string> iceP_proxy; - std::optional iceP_obj; + std::optional<::std::int32_t> iceP_obj; this->opOut(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr); diff --git a/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.h b/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.h index 58a5eea5866f..7d45858d898d 100644 --- a/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.h +++ b/slice2cpp/java/test/src/main/java/test/Slice/escape/Clash.h @@ -190,33 +190,33 @@ class IntfPrx : public ::Ice::Proxy void _iceI_obj(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void op(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; + void op(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; - ::std::future opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; + ::std::future opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; ::std::function - opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, + opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, ::std::function response_, ::std::function ex_ = nullptr, ::std::function sent_ = nullptr, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const std::optional<::std::string>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; + void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>> opOutAsync(const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>> opOutAsync(const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; ::std::function - opOutAsync(::std::function, std::optional)> response, + opOutAsync(::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>>&, const ::Ice::Context&) const; + void _iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>>&, const ::Ice::Context&) const; /// \endcond /** @@ -275,17 +275,17 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; ::std::string hashCode; - int clone; + ::std::int32_t clone; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs, hashCode, clone); } @@ -319,7 +319,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy, int obj, int getCookie, const ::std::string& clone) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy, ::std::int32_t obj, ::std::int32_t getCookie, const ::std::string& clone) : s(s), context(context), current(current), @@ -344,7 +344,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const int&, const int&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::int32_t&, const ::std::int32_t&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy, obj, getCookie, clone); } @@ -357,20 +357,20 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; - int typeId; - short del; - std::optional cookie; + ::std::int32_t current; + ::std::int16_t response; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; ::std::string in; ::std::string proxy; - int obj; - int getCookie; + ::std::int32_t obj; + ::std::int32_t getCookie; ::std::string clone; }; @@ -396,7 +396,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr, const ::std::string& cause) : + Ex(::std::int16_t istr, ::std::int32_t ostr, const ::std::string& cause) : istr(istr), ostr(ostr), cause(cause) @@ -407,7 +407,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr, cause); } @@ -418,8 +418,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; ::std::string cause; }; @@ -516,7 +516,7 @@ class Intf : public virtual ::Ice::Object bool _iceD_obj(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void op(::std::string context, ::std::string current, ::std::string response, ::std::string ex, ::std::string sent, ::std::string cookie, ::std::string sync, ::std::string result, ::std::string istr, ::std::string ostr, std::optional<::std::string> proxy, std::optional obj, const ::Ice::Current& current_) = 0; + virtual void op(::std::string context, ::std::string current, ::std::string response, ::std::string ex, ::std::string sent, ::std::string cookie, ::std::string sync, ::std::string result, ::std::string istr, ::std::string ostr, std::optional<::std::string> proxy, std::optional<::std::int32_t> obj, const ::Ice::Current& current_) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -537,10 +537,10 @@ class Intf : public virtual ::Ice::Object ::std::string istr; ::std::string ostr; std::optional<::std::string> proxy; - std::optional obj; + std::optional<::std::int32_t> obj; }; - virtual void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional& obj, const ::Ice::Current& current_) = 0; + virtual void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional<::std::int32_t>& obj, const ::Ice::Current& current_) = 0; /// \cond INTERNAL bool _iceD_opOut(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.cpp b/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.cpp index 7861a7077d88..3a3a92f6385a 100644 --- a/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.cpp +++ b/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.cpp @@ -106,30 +106,30 @@ const ::std::string iceC_abstract_new_notify_name = "notify"; } void -abstract::catchPrx::checkedCast(int iceP_clone, int& iceP_continue, const ::Ice::Context& context) const +abstract::catchPrx::checkedCast(::std::int32_t iceP_clone, ::std::int32_t& iceP_continue, const ::Ice::Context& context) const { - iceP_continue = _makePromiseOutgoing(true, this, &catchPrx::_iceI_checkedCast, iceP_clone, context).get(); + iceP_continue = _makePromiseOutgoing<::std::int32_t>(true, this, &catchPrx::_iceI_checkedCast, iceP_clone, context).get(); } -::std::future -abstract::catchPrx::checkedCastAsync(int iceP_clone, const ::Ice::Context& context) const +::std::future<::std::int32_t> +abstract::catchPrx::checkedCastAsync(::std::int32_t iceP_clone, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &catchPrx::_iceI_checkedCast, iceP_clone, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &catchPrx::_iceI_checkedCast, iceP_clone, context); } ::std::function -abstract::catchPrx::checkedCastAsync(int iceP_clone, - ::std::function response, +abstract::catchPrx::checkedCastAsync(::std::int32_t iceP_clone, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &abstract::catchPrx::_iceI_checkedCast, iceP_clone, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &abstract::catchPrx::_iceI_checkedCast, iceP_clone, context); } /// \cond INTERNAL void -abstract::catchPrx::_iceI_checkedCast(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_clone, const ::Ice::Context& context) const +abstract::catchPrx::_iceI_checkedCast(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_clone, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_abstract_catch_checkedCast_name); outAsync->invoke(iceC_abstract_catch_checkedCast_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -191,19 +191,19 @@ abstract::finalizePrx::ice_staticId() } ::abstract::assert -abstract::newPrx::notify(const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, int iceP_static, int iceP_strictfp, int iceP_super, const ::Ice::Context& context) const +abstract::newPrx::notify(const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, ::std::int32_t iceP_static, ::std::int32_t iceP_strictfp, ::std::int32_t iceP_super, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &newPrx::_iceI_notify, iceP_notifyAll, iceP_null, iceP_package, iceP_public, iceP_return, iceP_static, iceP_strictfp, iceP_super, context).get(); } ::std::future<::abstract::assert> -abstract::newPrx::notifyAsync(const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, int iceP_static, int iceP_strictfp, int iceP_super, const ::Ice::Context& context) const +abstract::newPrx::notifyAsync(const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, ::std::int32_t iceP_static, ::std::int32_t iceP_strictfp, ::std::int32_t iceP_super, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &newPrx::_iceI_notify, iceP_notifyAll, iceP_null, iceP_package, iceP_public, iceP_return, iceP_static, iceP_strictfp, iceP_super, context); } ::std::function -abstract::newPrx::notifyAsync(const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, int iceP_static, int iceP_strictfp, int iceP_super, +abstract::newPrx::notifyAsync(const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, ::std::int32_t iceP_static, ::std::int32_t iceP_strictfp, ::std::int32_t iceP_super, ::std::function response, ::std::function ex, ::std::function sent, @@ -214,7 +214,7 @@ abstract::newPrx::notifyAsync(const _cpp_break& iceP_notifyAll, const ::std::sha /// \cond INTERNAL void -abstract::newPrx::_iceI_notify(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, int iceP_static, int iceP_strictfp, int iceP_super, const ::Ice::Context& context) const +abstract::newPrx::_iceI_notify(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_break& iceP_notifyAll, const ::std::shared_ptr<_cpp_else>& iceP_null, const ::std::optional& iceP_package, const ::std::optional& iceP_public, const ::std::optional& iceP_return, ::std::int32_t iceP_static, ::std::int32_t iceP_strictfp, ::std::int32_t iceP_super, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_abstract_new_notify_name); outAsync->invoke(iceC_abstract_new_notify_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -314,11 +314,11 @@ abstract::_cpp_catch::_iceD_checkedCast(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_clone; + ::std::int32_t iceP_clone; istr->readAll(iceP_clone); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int iceP_continue) + auto responseCB = [inA](::std::int32_t iceP_continue) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_continue); @@ -555,9 +555,9 @@ abstract::_cpp_new::_iceD_notify(::IceInternal::Incoming& inS, const ::Ice::Curr ::std::optional iceP_package; ::std::optional iceP_public; ::std::optional iceP_return; - int iceP_static; - int iceP_strictfp; - int iceP_super; + ::std::int32_t iceP_static; + ::std::int32_t iceP_strictfp; + ::std::int32_t iceP_super; istr->readAll(iceP_notifyAll, iceP_null, iceP_package, iceP_public, iceP_return, iceP_static, iceP_strictfp, iceP_super); istr->readPendingValues(); inS.endReadParams(); diff --git a/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.h b/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.h index deee9dd4fb0e..9e063a76472a 100644 --- a/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.h +++ b/slice2cpp/java/test/src/main/java/test/Slice/escape/Key.h @@ -62,29 +62,29 @@ using _cpp_for = ::std::vector; using _cpp_goto = ::std::map<::std::string, assert>; -constexpr int _cpp_switch = 0; +constexpr ::std::int32_t _cpp_switch = 0; -constexpr int synchronized = 0; +constexpr ::std::int32_t synchronized = 0; -constexpr int _cpp_this = 0; +constexpr ::std::int32_t _cpp_this = 0; -constexpr int _cpp_throw = 0; +constexpr ::std::int32_t _cpp_throw = 0; -constexpr int toString = 0; +constexpr ::std::int32_t toString = 0; -constexpr int _cpp_try = 0; +constexpr ::std::int32_t _cpp_try = 0; -constexpr int uncheckedCast = 0; +constexpr ::std::int32_t uncheckedCast = 0; -constexpr int _cpp_volatile = 0; +constexpr ::std::int32_t _cpp_volatile = 0; -constexpr int wait = 0; +constexpr ::std::int32_t wait = 0; -constexpr int _cpp_while = 0; +constexpr ::std::int32_t _cpp_while = 0; -constexpr int finally = 0; +constexpr ::std::int32_t finally = 0; -constexpr int getClass = 0; +constexpr ::std::int32_t getClass = 0; } @@ -95,19 +95,19 @@ class catchPrx : public ::Ice::Proxy { public: - void checkedCast(int clone, int& _cpp_continue, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void checkedCast(::std::int32_t clone, ::std::int32_t& _cpp_continue, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future checkedCastAsync(int clone, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> checkedCastAsync(::std::int32_t clone, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - checkedCastAsync(int clone, - ::std::function response, + checkedCastAsync(::std::int32_t clone, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_checkedCast(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_checkedCast(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class newPrx : public ::Ice::Proxy { public: - assert notify(const _cpp_break& notifyAll, const ::std::shared_ptr<_cpp_else>& null, const ::std::optional& package, const ::std::optional& _cpp_public, const ::std::optional& _cpp_return, int _cpp_static, int strictfp, int super, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + assert notify(const _cpp_break& notifyAll, const ::std::shared_ptr<_cpp_else>& null, const ::std::optional& package, const ::std::optional& _cpp_public, const ::std::optional& _cpp_return, ::std::int32_t _cpp_static, ::std::int32_t strictfp, ::std::int32_t super, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future notifyAsync(const _cpp_break& notifyAll, const ::std::shared_ptr<_cpp_else>& null, const ::std::optional& package, const ::std::optional& _cpp_public, const ::std::optional& _cpp_return, int _cpp_static, int strictfp, int super, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future notifyAsync(const _cpp_break& notifyAll, const ::std::shared_ptr<_cpp_else>& null, const ::std::optional& package, const ::std::optional& _cpp_public, const ::std::optional& _cpp_return, ::std::int32_t _cpp_static, ::std::int32_t strictfp, ::std::int32_t super, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - notifyAsync(const _cpp_break& notifyAll, const ::std::shared_ptr<_cpp_else>& null, const ::std::optional& package, const ::std::optional& _cpp_public, const ::std::optional& _cpp_return, int _cpp_static, int strictfp, int super, + notifyAsync(const _cpp_break& notifyAll, const ::std::shared_ptr<_cpp_else>& null, const ::std::optional& package, const ::std::optional& _cpp_public, const ::std::optional& _cpp_return, ::std::int32_t _cpp_static, ::std::int32_t strictfp, ::std::int32_t super, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_notify(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_break&, const ::std::shared_ptr<_cpp_else>&, const ::std::optional&, const ::std::optional&, const ::std::optional&, int, int, int, const ::Ice::Context&) const; + void _iceI_notify(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_break&, const ::std::shared_ptr<_cpp_else>&, const ::std::optional&, const ::std::optional&, const ::std::optional&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -359,13 +359,13 @@ namespace abstract struct _cpp_break { - int _cpp_case; + ::std::int32_t _cpp_case; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_case); } @@ -399,7 +399,7 @@ class _cpp_else : public ::Ice::ValueHelper<_cpp_else, ::Ice::Value> /** * One-shot constructor to initialize all data members. */ - _cpp_else(int _cpp_if, const ::std::optional<::abstract::defaultPrx>& equals, int final) : + _cpp_else(::std::int32_t _cpp_if, const ::std::optional<::abstract::defaultPrx>& equals, ::std::int32_t final) : _cpp_if(_cpp_if), equals(equals), final(final) @@ -410,7 +410,7 @@ class _cpp_else : public ::Ice::ValueHelper<_cpp_else, ::Ice::Value> * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(_cpp_if, equals, final); } @@ -421,9 +421,9 @@ class _cpp_else : public ::Ice::ValueHelper<_cpp_else, ::Ice::Value> */ static const ::std::string& ice_staticId(); - int _cpp_if; + ::std::int32_t _cpp_if; ::std::optional<::abstract::defaultPrx> equals; - int final; + ::std::int32_t final; }; /// \cond INTERNAL @@ -448,7 +448,7 @@ class hashCode : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_if); } @@ -468,7 +468,7 @@ class hashCode : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - import(int _cpp_if, int instanceof, int native) : + import(::std::int32_t _cpp_if, ::std::int32_t instanceof, ::std::int32_t native) : ::Ice::UserExceptionHelper(_cpp_if), instanceof(instanceof), native(native) @@ -499,7 +499,7 @@ class import : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_if, instanceof, native); } @@ -510,8 +510,8 @@ class import : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int instanceof; - int native; + ::std::int32_t instanceof; + ::std::int32_t native; }; } @@ -553,7 +553,7 @@ class _cpp_catch : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void checkedCastAsync(int clone, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void checkedCastAsync(::std::int32_t clone, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_checkedCast(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -681,7 +681,7 @@ class _cpp_new : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual assert notify(_cpp_break notifyAll, ::std::shared_ptr null, ::std::optional package, ::std::optional _cpp_public, ::std::optional _cpp_return, int _cpp_static, int strictfp, int super, const ::Ice::Current& current) = 0; + virtual assert notify(_cpp_break notifyAll, ::std::shared_ptr null, ::std::optional package, ::std::optional _cpp_public, ::std::optional _cpp_return, ::std::int32_t _cpp_static, ::std::int32_t strictfp, ::std::int32_t super, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_notify(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/java/test/src/main/java/test/Slice/macros/Test.h b/slice2cpp/java/test/src/main/java/test/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/java/test/src/main/java/test/Slice/macros/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/java/test/src/main/java/test/Slice/structure/Test.h b/slice2cpp/java/test/src/main/java/test/Slice/structure/Test.h index c4d4f3e781dd..8ef4e8b73e38 100644 --- a/slice2cpp/java/test/src/main/java/test/Slice/structure/Test.h +++ b/slice2cpp/java/test/src/main/java/test/Slice/structure/Test.h @@ -40,7 +40,7 @@ namespace Test using StringSeq = ::std::vector<::std::string>; -using IntList = ::std::vector; +using IntList = ::std::vector<::std::int32_t>; using StringDict = ::std::map<::std::string, ::std::string>; @@ -66,10 +66,10 @@ struct S1 struct S2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -84,7 +84,7 @@ struct S2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const + std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, ss, il, sd, s, cls, prx); } @@ -118,7 +118,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C(int i) : + explicit C(::std::int32_t i) : i(i) { } @@ -127,7 +127,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -138,7 +138,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/js/test/Ice/acm/Test.cpp b/slice2cpp/js/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/js/test/Ice/acm/Test.cpp +++ b/slice2cpp/js/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/js/test/Ice/acm/Test.h b/slice2cpp/js/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/js/test/Ice/acm/Test.h +++ b/slice2cpp/js/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/ami/Test.cpp b/slice2cpp/js/test/Ice/ami/Test.cpp index a15e2a9f0876..f4ee63ad5ac9 100644 --- a/slice2cpp/js/test/Ice/ami/Test.cpp +++ b/slice2cpp/js/test/Ice/ami/Test.cpp @@ -217,30 +217,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -325,30 +325,30 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -358,19 +358,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -381,7 +381,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -429,19 +429,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -452,7 +452,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -876,7 +876,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -914,7 +914,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -928,7 +928,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -960,7 +960,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); diff --git a/slice2cpp/js/test/Ice/ami/Test.h b/slice2cpp/js/test/Ice/ami/Test.h index 9b1042bc2988..dedd10ec29f1 100644 --- a/slice2cpp/js/test/Ice/ami/Test.h +++ b/slice2cpp/js/test/Ice/ami/Test.h @@ -160,18 +160,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -202,33 +202,33 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -246,19 +246,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -602,7 +602,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -617,12 +617,12 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -632,7 +632,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/defaultValue/Test.h b/slice2cpp/js/test/Ice/defaultValue/Test.h index b2d68ec45867..15064099541b 100644 --- a/slice2cpp/js/test/Ice/defaultValue/Test.h +++ b/slice2cpp/js/test/Ice/defaultValue/Test.h @@ -71,13 +71,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -97,9 +97,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -109,11 +109,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -124,10 +124,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; @@ -138,8 +138,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -149,7 +149,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -158,10 +158,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -171,8 +171,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -182,7 +182,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -192,10 +192,10 @@ struct Struct3 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; @@ -206,8 +206,8 @@ struct Struct3 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -217,7 +217,7 @@ struct Struct3 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -225,13 +225,13 @@ struct Struct3 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -240,10 +240,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -257,7 +257,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, is, st, dict); } @@ -291,7 +291,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -315,7 +315,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -328,16 +328,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -364,7 +364,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -379,7 +379,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -501,7 +501,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -525,7 +525,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -538,16 +538,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -571,7 +571,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -586,7 +586,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/js/test/Ice/enums/Test.h b/slice2cpp/js/test/Ice/enums/Test.h index 4faaa217843e..34fd9564a243 100644 --- a/slice2cpp/js/test/Ice/enums/Test.h +++ b/slice2cpp/js/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/js/test/Ice/exceptions/Test.cpp b/slice2cpp/js/test/Ice/exceptions/Test.cpp index c58467e06384..be54049cb961 100644 --- a/slice2cpp/js/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/js/test/Ice/exceptions/Test.cpp @@ -249,19 +249,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -272,7 +272,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -298,19 +298,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -321,7 +321,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -351,19 +351,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -374,7 +374,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -400,19 +400,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -423,7 +423,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -449,19 +449,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -472,7 +472,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -498,19 +498,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -521,7 +521,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -547,19 +547,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -570,7 +570,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -596,19 +596,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -619,7 +619,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -631,19 +631,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -654,7 +654,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -666,19 +666,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -689,7 +689,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1249,7 +1249,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1264,7 +1264,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1279,8 +1279,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1295,9 +1295,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1312,8 +1312,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1328,9 +1328,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1345,9 +1345,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1362,7 +1362,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1377,8 +1377,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1393,9 +1393,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/js/test/Ice/exceptions/Test.h b/slice2cpp/js/test/Ice/exceptions/Test.h index 220189e46bb0..02e1c200b597 100644 --- a/slice2cpp/js/test/Ice/exceptions/Test.h +++ b/slice2cpp/js/test/Ice/exceptions/Test.h @@ -155,154 +155,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -644,7 +644,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -653,7 +653,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -664,7 +664,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -684,7 +684,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -694,7 +694,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -705,7 +705,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -721,7 +721,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -731,7 +731,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -742,7 +742,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -758,7 +758,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -767,7 +767,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -778,7 +778,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -870,52 +870,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/hold/Test.cpp b/slice2cpp/js/test/Ice/hold/Test.cpp index 9e0f56e0145d..feb78e98de3d 100644 --- a/slice2cpp/js/test/Ice/hold/Test.cpp +++ b/slice2cpp/js/test/Ice/hold/Test.cpp @@ -61,19 +61,19 @@ const ::std::string iceC_Test_Hold_shutdown_name = "shutdown"; } void -Test::HoldPrx::putOnHold(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context).get(); } ::std::future -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context); } ::std::function -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HoldPrx::putOnHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_putOnHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -127,19 +127,19 @@ Test::HoldPrx::_iceI_waitForHold(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::HoldPrx::setOneway(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOneway(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context).get(); } ::std::future -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context); } ::std::function -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -150,7 +150,7 @@ Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, /// \cond INTERNAL void -Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_setOneway_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -161,31 +161,31 @@ Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -int -Test::HoldPrx::set(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::int32_t +Test::HoldPrx::set(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); } -::std::future -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } ::std::function -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, - ::std::function response, +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } /// \cond INTERNAL void -Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_delay, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hold_set_name); outAsync->invoke(iceC_Test_Hold_set_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -265,7 +265,7 @@ Test::Hold::_iceD_putOnHold(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->putOnHold(iceP_seconds, current); @@ -292,8 +292,8 @@ Test::Hold::_iceD_setOneway(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_expected; + ::std::int32_t iceP_value; + ::std::int32_t iceP_expected; istr->readAll(iceP_value, iceP_expected); inS.endReadParams(); this->setOneway(iceP_value, iceP_expected, current); @@ -308,11 +308,11 @@ Test::Hold::_iceD_set(::IceInternal::Incoming& inS, const ::Ice::Current& curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_delay; + ::std::int32_t iceP_value; + ::std::int32_t iceP_delay; istr->readAll(iceP_value, iceP_delay); inS.endReadParams(); - int ret = this->set(iceP_value, iceP_delay, current); + ::std::int32_t ret = this->set(iceP_value, iceP_delay, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/Ice/hold/Test.h b/slice2cpp/js/test/Ice/hold/Test.h index 6767cf758c7e..e02713366f9c 100644 --- a/slice2cpp/js/test/Ice/hold/Test.h +++ b/slice2cpp/js/test/Ice/hold/Test.h @@ -48,19 +48,19 @@ class HoldPrx : public ::Ice::Proxy { public: - void putOnHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void putOnHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future putOnHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future putOnHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - putOnHoldAsync(int seconds, + putOnHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitForHold(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -77,34 +77,34 @@ class HoldPrx : public ::Ice::Proxy void _iceI_waitForHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void setOneway(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setOnewayAsync(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setOnewayAsync(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setOnewayAsync(int value, int expected, + setOnewayAsync(::std::int32_t value, ::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int set(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setAsync(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> setAsync(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setAsync(int value, int delay, - ::std::function response, + setAsync(::std::int32_t value, ::std::int32_t delay, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -208,7 +208,7 @@ class Hold : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void putOnHold(int seconds, const ::Ice::Current& current) = 0; + virtual void putOnHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_putOnHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -218,12 +218,12 @@ class Hold : public virtual ::Ice::Object bool _iceD_waitForHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void setOneway(int value, int expected, const ::Ice::Current& current) = 0; + virtual void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int set(int value, int delay, const ::Ice::Current& current) = 0; + virtual ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_set(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/import/Demo/Circle.h b/slice2cpp/js/test/Ice/import/Demo/Circle.h index f3e277f0f776..7dfa954f4b9b 100644 --- a/slice2cpp/js/test/Ice/import/Demo/Circle.h +++ b/slice2cpp/js/test/Ice/import/Demo/Circle.h @@ -59,13 +59,13 @@ namespace gx struct Circle { ::Demo::gx::Point center; - long long int radius; + ::std::int64_t radius; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(center, radius); } diff --git a/slice2cpp/js/test/Ice/import/Demo/Point.h b/slice2cpp/js/test/Ice/import/Demo/Point.h index 2d187f5e7578..0e85eac469d4 100644 --- a/slice2cpp/js/test/Ice/import/Demo/Point.h +++ b/slice2cpp/js/test/Ice/import/Demo/Point.h @@ -57,14 +57,14 @@ namespace gx struct Point { - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } diff --git a/slice2cpp/js/test/Ice/inheritance/Test.h b/slice2cpp/js/test/Ice/inheritance/Test.h index c214c90f532e..4c09120073b4 100644 --- a/slice2cpp/js/test/Ice/inheritance/Test.h +++ b/slice2cpp/js/test/Ice/inheritance/Test.h @@ -721,7 +721,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -730,7 +730,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -741,7 +741,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; /// \cond INTERNAL @@ -764,7 +764,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -774,7 +774,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -785,7 +785,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -804,7 +804,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -814,7 +814,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -825,7 +825,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -844,7 +844,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -854,7 +854,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -865,7 +865,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -889,7 +889,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -898,7 +898,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -909,7 +909,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -928,7 +928,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -938,7 +938,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -949,7 +949,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -968,7 +968,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -978,7 +978,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -989,7 +989,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1008,7 +1008,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1018,7 +1018,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1029,7 +1029,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1053,7 +1053,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1062,7 +1062,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1073,7 +1073,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1092,7 +1092,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1102,7 +1102,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1113,7 +1113,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1132,7 +1132,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1142,7 +1142,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1153,7 +1153,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1172,7 +1172,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1182,7 +1182,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1193,7 +1193,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1217,7 +1217,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1226,7 +1226,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1237,7 +1237,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1256,7 +1256,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1266,7 +1266,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1277,7 +1277,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1296,7 +1296,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1306,7 +1306,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1317,7 +1317,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1336,7 +1336,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1346,7 +1346,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1357,7 +1357,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1381,7 +1381,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1390,7 +1390,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1401,7 +1401,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1420,7 +1420,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1430,7 +1430,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1441,7 +1441,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1460,7 +1460,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1470,7 +1470,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1481,7 +1481,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1500,7 +1500,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1510,7 +1510,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1521,7 +1521,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1545,7 +1545,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1554,7 +1554,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1565,7 +1565,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1584,7 +1584,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1594,7 +1594,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1605,7 +1605,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1624,7 +1624,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1634,7 +1634,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1645,7 +1645,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1664,7 +1664,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1674,7 +1674,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1685,7 +1685,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } diff --git a/slice2cpp/js/test/Ice/location/Test.cpp b/slice2cpp/js/test/Ice/location/Test.cpp index 457a88f7cfee..f59447f9b4eb 100644 --- a/slice2cpp/js/test/Ice/location/Test.cpp +++ b/slice2cpp/js/test/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/Ice/location/Test.h b/slice2cpp/js/test/Ice/location/Test.h index 54689962018c..5e6f07b7aa2d 100644 --- a/slice2cpp/js/test/Ice/location/Test.h +++ b/slice2cpp/js/test/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/objects/Test.h b/slice2cpp/js/test/Ice/objects/Test.h index dede849fc46b..ef71a8fc077c 100644 --- a/slice2cpp/js/test/Ice/objects/Test.h +++ b/slice2cpp/js/test/Ice/objects/Test.h @@ -102,7 +102,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -120,9 +120,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -949,14 +949,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1239,7 +1239,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1249,7 +1249,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1262,7 +1262,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/js/test/Ice/operations/Test.cpp b/slice2cpp/js/test/Ice/operations/Test.cpp index 77b0c1e0db00..d0e7f22388a1 100644 --- a/slice2cpp/js/test/Ice/operations/Test.cpp +++ b/slice2cpp/js/test/Ice/operations/Test.cpp @@ -487,37 +487,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -528,7 +528,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -583,39 +583,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -626,7 +626,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2584,30 +2584,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2745,31 +2745,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2781,31 +2781,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2817,31 +2817,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2853,31 +2853,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3816,12 +3816,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3854,15 +3854,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4657,7 +4657,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4725,10 +4725,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4742,10 +4742,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4759,10 +4759,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4776,10 +4776,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/Ice/operations/Test.h b/slice2cpp/js/test/Ice/operations/Test.h index dd7fbe9e9cca..3b9d7e412be8 100644 --- a/slice2cpp/js/test/Ice/operations/Test.h +++ b/slice2cpp/js/test/Ice/operations/Test.h @@ -70,15 +70,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -114,11 +114,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -142,15 +142,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -300,19 +300,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -330,19 +330,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -960,18 +960,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1031,64 +1031,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1693,14 +1693,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1840,11 +1840,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1868,13 +1868,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2443,7 +2443,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2468,22 +2468,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/optional/ClientPrivate.cpp b/slice2cpp/js/test/Ice/optional/ClientPrivate.cpp index de1a0a7a5861..894d8c5f7566 100644 --- a/slice2cpp/js/test/Ice/optional/ClientPrivate.cpp +++ b/slice2cpp/js/test/Ice/optional/ClientPrivate.cpp @@ -92,19 +92,19 @@ Test::Initial2Prx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::Ice /// \endcond void -Test::Initial2Prx::opVoid(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoid(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context).get(); } ::std::future -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context); } ::std::function -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, ::std::function response, ::std::function ex, ::std::function sent, @@ -115,7 +115,7 @@ Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::opti /// \cond INTERNAL void -Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Initial2_opVoid_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -181,7 +181,7 @@ Test::Initial2::_iceD_opVoid(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_v; istr->readAll({1, 2}, iceP_a, iceP_v); inS.endReadParams(); diff --git a/slice2cpp/js/test/Ice/optional/ClientPrivate.h b/slice2cpp/js/test/Ice/optional/ClientPrivate.h index 04dff1d99466..3a0aff1f3242 100644 --- a/slice2cpp/js/test/Ice/optional/ClientPrivate.h +++ b/slice2cpp/js/test/Ice/optional/ClientPrivate.h @@ -64,19 +64,19 @@ class Initial2Prx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const std::optional<::std::shared_ptr<::Ice::Value>>&, const ::Ice::Context&) const; /// \endcond - void opVoid(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opVoid(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, + opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const ::Ice::Context&) const; + void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const ::Ice::Context&) const; /// \endcond /** @@ -171,7 +171,7 @@ class Initial2 : public virtual ::Ice::Object bool _iceD_opClassAndUnknownOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opVoid(std::optional a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; + virtual void opVoid(std::optional<::std::int32_t> a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVoid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/optional/Test.cpp b/slice2cpp/js/test/Ice/optional/Test.cpp index 941c8b0c9d1e..32407e760518 100644 --- a/slice2cpp/js/test/Ice/optional/Test.cpp +++ b/slice2cpp/js/test/Ice/optional/Test.cpp @@ -339,19 +339,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -362,7 +362,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -388,19 +388,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -411,7 +411,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -437,19 +437,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -460,7 +460,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -485,37 +485,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,7 +526,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -581,37 +581,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -622,44 +622,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -670,44 +670,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -718,7 +718,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -3150,7 +3150,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3167,7 +3167,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3184,7 +3184,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3201,11 +3201,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3237,11 +3237,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3255,11 +3255,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3273,11 +3273,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/Ice/optional/Test.h b/slice2cpp/js/test/Ice/optional/Test.h index 3a4b0eae43a7..8d80ed5d6034 100644 --- a/slice2cpp/js/test/Ice/optional/Test.h +++ b/slice2cpp/js/test/Ice/optional/Test.h @@ -69,15 +69,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -101,21 +101,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -223,64 +223,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -298,49 +298,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1156,13 +1156,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1170,13 +1170,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1198,13 +1198,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1238,7 +1238,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1247,7 +1247,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1258,7 +1258,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1281,7 +1281,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1319,7 +1319,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1330,11 +1330,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1378,7 +1378,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1390,7 +1390,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1401,10 +1401,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1423,7 +1423,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1434,7 +1434,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1458,8 +1458,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1484,7 +1484,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1495,7 +1495,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1526,7 +1526,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1536,7 +1536,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1547,7 +1547,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1741,7 +1741,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1750,7 +1750,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1761,7 +1761,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1866,7 +1866,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1878,7 +1878,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1890,7 +1890,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1912,7 +1912,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1925,7 +1925,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1955,7 +1955,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1966,7 +1966,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2078,17 +2078,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2098,11 +2098,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2126,11 +2126,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2140,11 +2140,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2154,11 +2154,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/retry/Test.cpp b/slice2cpp/js/test/Ice/retry/Test.cpp index d86b279793d5..aa5dcac5781d 100644 --- a/slice2cpp/js/test/Ice/retry/Test.cpp +++ b/slice2cpp/js/test/Ice/retry/Test.cpp @@ -95,31 +95,31 @@ Test::RetryPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); } -::std::future -Test::RetryPrx::opIdempotentAsync(int iceP_c, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); } ::std::function -Test::RetryPrx::opIdempotentAsync(int iceP_c, - ::std::function response, +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); } /// \cond INTERNAL void -Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_c, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Retry_opIdempotent_name); outAsync->invoke(iceC_Test_Retry_opIdempotent_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -276,10 +276,10 @@ Test::Retry::_iceD_opIdempotent(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_c; + ::std::int32_t iceP_c; istr->readAll(iceP_c); inS.endReadParams(); - int ret = this->opIdempotent(iceP_c, current); + ::std::int32_t ret = this->opIdempotent(iceP_c, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/Ice/retry/Test.h b/slice2cpp/js/test/Ice/retry/Test.h index 9ad395ca7e88..988734543418 100644 --- a/slice2cpp/js/test/Ice/retry/Test.h +++ b/slice2cpp/js/test/Ice/retry/Test.h @@ -63,19 +63,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - int opIdempotent(int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIdempotentAsync(int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIdempotentAsync(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIdempotentAsync(int c, - ::std::function response, + opIdempotentAsync(::std::int32_t c, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opNotIdempotent(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -212,7 +212,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opIdempotent(int c, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Ice/scope/Test.h b/slice2cpp/js/test/Ice/scope/Test.h index 06b58770c6e3..d4596c711107 100644 --- a/slice2cpp/js/test/Ice/scope/Test.h +++ b/slice2cpp/js/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/js/test/Ice/slicing/objects/Test.h b/slice2cpp/js/test/Ice/slicing/objects/Test.h index e19b48c9137c..ae6df919a59a 100644 --- a/slice2cpp/js/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/js/test/Ice/slicing/objects/Test.h @@ -61,7 +61,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -958,7 +958,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -967,7 +967,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -978,7 +978,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -997,7 +997,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1007,7 +1007,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1056,7 +1056,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1066,7 +1066,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1096,7 +1096,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1106,7 +1106,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1236,7 +1236,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -1246,7 +1246,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -1295,7 +1295,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1305,7 +1305,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -1335,7 +1335,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -1345,7 +1345,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -1356,7 +1356,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -1375,7 +1375,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -1385,7 +1385,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -1415,7 +1415,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1425,7 +1425,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/js/test/Ice/stream/Test.h b/slice2cpp/js/test/Ice/stream/Test.h index a1efb3eb34f9..e2be82d93722 100644 --- a/slice2cpp/js/test/Ice/stream/Test.h +++ b/slice2cpp/js/test/Ice/stream/Test.h @@ -74,11 +74,11 @@ using MyEnumSS = ::std::vector; using MyClassSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -149,10 +149,10 @@ namespace Test struct SmallStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -163,7 +163,7 @@ struct SmallStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, p); } @@ -197,7 +197,7 @@ class OptionalClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - OptionalClass(bool bo, ::Ice::Byte by, const std::optional& sh, const std::optional& i) : + OptionalClass(bool bo, ::std::uint8_t by, const std::optional<::std::int16_t>& sh, const std::optional<::std::int32_t>& i) : bo(bo), by(by), sh(sh), @@ -209,7 +209,7 @@ class OptionalClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(bo, by, sh, i); } @@ -221,9 +221,9 @@ class OptionalClass : public ::Ice::ValueHelper static const ::std::string& ice_staticId(); bool bo; - ::Ice::Byte by; - std::optional sh; - std::optional i; + ::std::uint8_t by; + std::optional<::std::int16_t> sh; + std::optional<::std::int32_t> i; }; /// \cond INTERNAL diff --git a/slice2cpp/js/test/Ice/timeout/Test.cpp b/slice2cpp/js/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/js/test/Ice/timeout/Test.cpp +++ b/slice2cpp/js/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/js/test/Ice/timeout/Test.h b/slice2cpp/js/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/js/test/Ice/timeout/Test.h +++ b/slice2cpp/js/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Slice/escape/Clash.cpp b/slice2cpp/js/test/Slice/escape/Clash.cpp index d54b5cb2b753..6b831f07f770 100644 --- a/slice2cpp/js/test/Slice/escape/Clash.cpp +++ b/slice2cpp/js/test/Slice/escape/Clash.cpp @@ -389,19 +389,19 @@ Clash::IntfPrx::_iceI_obj(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT< /// \endcond void -Clash::IntfPrx::op(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::op(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &IntfPrx::_iceI_op, iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, context).get(); } ::std::future -Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &IntfPrx::_iceI_op, iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, context); } ::std::function -Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, +Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, ::std::function response, ::std::function ex, ::std::function sent, @@ -412,7 +412,7 @@ Clash::IntfPrx::opAsync(const ::std::string& iceP_context, const ::std::string& /// \cond INTERNAL void -Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_context, const ::std::string& iceP_current, const ::std::string& iceP_response, const ::std::string& iceP_ex, const ::std::string& iceP_sent, const ::std::string& iceP_cookie, const ::std::string& iceP_sync, const ::std::string& iceP_result, const ::std::string& iceP_istr, const ::std::string& iceP_ostr, const std::optional<::std::string>& iceP_proxy, const std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { outAsync->invoke(iceC_Clash_Intf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -425,9 +425,9 @@ Clash::IntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT& iceP_proxy, std::optional& iceP_obj, const ::Ice::Context& context) const +Clash::IntfPrx::opOut(::std::string& iceP_context, ::std::string& iceP_current, ::std::string& iceP_response, ::std::string& iceP_ex, ::std::string& iceP_sent, ::std::string& iceP_cookie, ::std::string& iceP_sync, ::std::string& iceP_result, ::std::string& iceP_istr, ::std::string& iceP_ostr, std::optional<::std::string>& iceP_proxy, std::optional<::std::int32_t>& iceP_obj, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>(true, this, &IntfPrx::_iceI_opOut, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>(true, this, &IntfPrx::_iceI_opOut, context).get(); iceP_context = ::std::move(::std::get<0>(_result)); iceP_current = ::std::move(::std::get<1>(_result)); iceP_response = ::std::move(::std::get<2>(_result)); @@ -442,28 +442,28 @@ Clash::IntfPrx::opOut(::std::string& iceP_context, ::std::string& iceP_current, iceP_obj = ::std::get<11>(_result); } -::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>> +::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>> Clash::IntfPrx::opOutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>, ::std::promise>(false, this, &IntfPrx::_iceI_opOut, context); + return _makePromiseOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>, ::std::promise>(false, this, &IntfPrx::_iceI_opOut, context); } ::std::function -Clash::IntfPrx::opOutAsync(::std::function, std::optional)> response, +Clash::IntfPrx::opOutAsync(::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>&& _result) + auto _responseCb = [response](::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>&& _result) { response(::std::move(::std::get<0>(_result)), ::std::move(::std::get<1>(_result)), ::std::move(::std::get<2>(_result)), ::std::move(::std::get<3>(_result)), ::std::move(::std::get<4>(_result)), ::std::move(::std::get<5>(_result)), ::std::move(::std::get<6>(_result)), ::std::move(::std::get<7>(_result)), ::std::move(::std::get<8>(_result)), ::std::move(::std::get<9>(_result)), ::std::move(::std::get<10>(_result)), ::std::get<11>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Clash::IntfPrx::_iceI_opOut, context); + return _makeLambdaOutgoing<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Clash::IntfPrx::_iceI_opOut, context); } /// \cond INTERNAL void -Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>>& outAsync, const ::Ice::Context& context) const +Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Clash_Intf_opOut_name); outAsync->invoke(iceC_Clash_Intf_opOut_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -471,7 +471,7 @@ Clash::IntfPrx::_iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsync nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional> v; + ::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>> v; istr->readAll(::std::get<0>(v), ::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<4>(v), ::std::get<5>(v), ::std::get<6>(v), ::std::get<7>(v), ::std::get<8>(v), ::std::get<9>(v)); istr->readAll({1, 2}, ::std::get<10>(v), ::std::get<11>(v)); return v; @@ -669,7 +669,7 @@ Clash::Intf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice::Current& curren ::std::string iceP_istr; ::std::string iceP_ostr; std::optional<::std::string> iceP_proxy; - std::optional iceP_obj; + std::optional<::std::int32_t> iceP_obj; istr->readAll(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr); istr->readAll({1, 2}, iceP_proxy, iceP_obj); inS.endReadParams(); @@ -696,7 +696,7 @@ Clash::Intf::_iceD_opOut(::IceInternal::Incoming& inS, const ::Ice::Current& cur ::std::string iceP_istr; ::std::string iceP_ostr; std::optional<::std::string> iceP_proxy; - std::optional iceP_obj; + std::optional<::std::int32_t> iceP_obj; this->opOut(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr, iceP_proxy, iceP_obj, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_context, iceP_current, iceP_response, iceP_ex, iceP_sent, iceP_cookie, iceP_sync, iceP_result, iceP_istr, iceP_ostr); diff --git a/slice2cpp/js/test/Slice/escape/Clash.h b/slice2cpp/js/test/Slice/escape/Clash.h index 58a5eea5866f..7d45858d898d 100644 --- a/slice2cpp/js/test/Slice/escape/Clash.h +++ b/slice2cpp/js/test/Slice/escape/Clash.h @@ -190,33 +190,33 @@ class IntfPrx : public ::Ice::Proxy void _iceI_obj(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void op(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; + void op(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; - ::std::future opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; + ::std::future opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; ::std::function - opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional& obj, + opAsync(const ::std::string& context, const ::std::string& current, const ::std::string& response, const ::std::string& ex, const ::std::string& sent, const ::std::string& cookie, const ::std::string& sync, const ::std::string& result, const ::std::string& istr, const ::std::string& ostr, const std::optional<::std::string>& proxy, const std::optional<::std::int32_t>& obj, ::std::function response_, ::std::function ex_ = nullptr, ::std::function sent_ = nullptr, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const std::optional<::std::string>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; + void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional<::std::int32_t>& obj, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>> opOutAsync(const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>> opOutAsync(const ::Ice::Context& context_ = ::Ice::noExplicitContext)const; ::std::function - opOutAsync(::std::function, std::optional)> response, + opOutAsync(::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context_ = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional>>>&, const ::Ice::Context&) const; + void _iceI_opOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, ::std::string, std::optional<::std::string>, std::optional<::std::int32_t>>>>&, const ::Ice::Context&) const; /// \endcond /** @@ -275,17 +275,17 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; ::std::string hashCode; - int clone; + ::std::int32_t clone; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs, hashCode, clone); } @@ -319,7 +319,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy, int obj, int getCookie, const ::std::string& clone) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy, ::std::int32_t obj, ::std::int32_t getCookie, const ::std::string& clone) : s(s), context(context), current(current), @@ -344,7 +344,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const int&, const int&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::int32_t&, const ::std::int32_t&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy, obj, getCookie, clone); } @@ -357,20 +357,20 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; - int typeId; - short del; - std::optional cookie; + ::std::int32_t current; + ::std::int16_t response; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; ::std::string in; ::std::string proxy; - int obj; - int getCookie; + ::std::int32_t obj; + ::std::int32_t getCookie; ::std::string clone; }; @@ -396,7 +396,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr, const ::std::string& cause) : + Ex(::std::int16_t istr, ::std::int32_t ostr, const ::std::string& cause) : istr(istr), ostr(ostr), cause(cause) @@ -407,7 +407,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr, cause); } @@ -418,8 +418,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; ::std::string cause; }; @@ -516,7 +516,7 @@ class Intf : public virtual ::Ice::Object bool _iceD_obj(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void op(::std::string context, ::std::string current, ::std::string response, ::std::string ex, ::std::string sent, ::std::string cookie, ::std::string sync, ::std::string result, ::std::string istr, ::std::string ostr, std::optional<::std::string> proxy, std::optional obj, const ::Ice::Current& current_) = 0; + virtual void op(::std::string context, ::std::string current, ::std::string response, ::std::string ex, ::std::string sent, ::std::string cookie, ::std::string sync, ::std::string result, ::std::string istr, ::std::string ostr, std::optional<::std::string> proxy, std::optional<::std::int32_t> obj, const ::Ice::Current& current_) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -537,10 +537,10 @@ class Intf : public virtual ::Ice::Object ::std::string istr; ::std::string ostr; std::optional<::std::string> proxy; - std::optional obj; + std::optional<::std::int32_t> obj; }; - virtual void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional& obj, const ::Ice::Current& current_) = 0; + virtual void opOut(::std::string& context, ::std::string& current, ::std::string& response, ::std::string& ex, ::std::string& sent, ::std::string& cookie, ::std::string& sync, ::std::string& result, ::std::string& istr, ::std::string& ostr, std::optional<::std::string>& proxy, std::optional<::std::int32_t>& obj, const ::Ice::Current& current_) = 0; /// \cond INTERNAL bool _iceD_opOut(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Slice/escape/Key.cpp b/slice2cpp/js/test/Slice/escape/Key.cpp index 183fa9c9a195..d9370cae6792 100644 --- a/slice2cpp/js/test/Slice/escape/Key.cpp +++ b/slice2cpp/js/test/Slice/escape/Key.cpp @@ -161,30 +161,30 @@ const ::std::string iceC_System_Test_op_name = "op"; } void -await::casePrx::_cpp_catch(int iceP_checked, int& iceP_continue, const ::Ice::Context& context) const +await::casePrx::_cpp_catch(::std::int32_t iceP_checked, ::std::int32_t& iceP_continue, const ::Ice::Context& context) const { - iceP_continue = _makePromiseOutgoing(true, this, &casePrx::_iceI_catch, iceP_checked, context).get(); + iceP_continue = _makePromiseOutgoing<::std::int32_t>(true, this, &casePrx::_iceI_catch, iceP_checked, context).get(); } -::std::future -await::casePrx::catchAsync(int iceP_checked, const ::Ice::Context& context) const +::std::future<::std::int32_t> +await::casePrx::catchAsync(::std::int32_t iceP_checked, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &casePrx::_iceI_catch, iceP_checked, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &casePrx::_iceI_catch, iceP_checked, context); } ::std::function -await::casePrx::catchAsync(int iceP_checked, - ::std::function response, +await::casePrx::catchAsync(::std::int32_t iceP_checked, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &await::casePrx::_iceI_catch, iceP_checked, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &await::casePrx::_iceI_catch, iceP_checked, context); } /// \cond INTERNAL void -await::casePrx::_iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_checked, const ::Ice::Context& context) const +await::casePrx::_iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_checked, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_await_case_catch_name); outAsync->invoke(iceC_await_case_catch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -432,19 +432,19 @@ await::optionalParamsPrx::ice_staticId() } ::await::var -await::implicitPrx::in(const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, int iceP_override, int iceP_params, int iceP_private, const ::Ice::Context& context) const +await::implicitPrx::in(const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &implicitPrx::_iceI_in, iceP_internal, iceP_is, iceP_lock, iceP_namespace, iceP_new, iceP_null, iceP_operator, iceP_override, iceP_params, iceP_private, context).get(); } ::std::future<::await::var> -await::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, int iceP_override, int iceP_params, int iceP_private, const ::Ice::Context& context) const +await::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &implicitPrx::_iceI_in, iceP_internal, iceP_is, iceP_lock, iceP_namespace, iceP_new, iceP_null, iceP_operator, iceP_override, iceP_params, iceP_private, context); } ::std::function -await::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, int iceP_override, int iceP_params, int iceP_private, +await::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, ::std::function response, ::std::function ex, ::std::function sent, @@ -455,7 +455,7 @@ await::implicitPrx::inAsync(const _cpp_break& iceP_internal, const ::std::shared /// \cond INTERNAL void -await::implicitPrx::_iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, int iceP_override, int iceP_params, int iceP_private, const ::Ice::Context& context) const +await::implicitPrx::_iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_break& iceP_internal, const ::std::shared_ptr<_cpp_delete>& iceP_is, const ::std::optional& iceP_lock, const ::std::optional& iceP_namespace, const ::std::optional& iceP_new, const ::std::shared_ptr<_cpp_delete>& iceP_null, const ::std::optional& iceP_operator, ::std::int32_t iceP_override, ::std::int32_t iceP_params, ::std::int32_t iceP_private, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_await_implicit_in_name); outAsync->invoke(iceC_await_implicit_in_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -651,11 +651,11 @@ await::_cpp_case::_iceD_catch(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_checked; + ::std::int32_t iceP_checked; istr->readAll(iceP_checked); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int iceP_continue) + auto responseCB = [inA](::std::int32_t iceP_continue) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_continue); @@ -1057,9 +1057,9 @@ await::implicit::_iceD_in(::IceInternal::Incoming& inS, const ::Ice::Current& cu ::std::optional iceP_new; ::std::shared_ptr iceP_null; ::std::optional iceP_operator; - int iceP_override; - int iceP_params; - int iceP_private; + ::std::int32_t iceP_override; + ::std::int32_t iceP_params; + ::std::int32_t iceP_private; istr->readAll(iceP_internal, iceP_is, iceP_lock, iceP_namespace, iceP_new, iceP_null, iceP_operator, iceP_override, iceP_params, iceP_private); istr->readPendingValues(); inS.endReadParams(); diff --git a/slice2cpp/js/test/Slice/escape/Key.h b/slice2cpp/js/test/Slice/escape/Key.h index e963d0b180fa..f5f616b50e3c 100644 --- a/slice2cpp/js/test/Slice/escape/Key.h +++ b/slice2cpp/js/test/Slice/escape/Key.h @@ -85,9 +85,9 @@ enum class var : unsigned char using _cpp_while = ::std::map<::std::string, _cpp_break>; -constexpr int _cpp_protected = 0; +constexpr ::std::int32_t _cpp_protected = 0; -constexpr int _cpp_public = 0; +constexpr ::std::int32_t _cpp_public = 0; namespace System { @@ -108,19 +108,19 @@ class casePrx : public ::Ice::Proxy { public: - void _cpp_catch(int checked, int& _cpp_continue, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void _cpp_catch(::std::int32_t checked, ::std::int32_t& _cpp_continue, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future catchAsync(int checked, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> catchAsync(::std::int32_t checked, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - catchAsync(int checked, - ::std::function response, + catchAsync(::std::int32_t checked, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_catch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -412,19 +412,19 @@ class implicitPrx : public ::Ice::Proxy { public: - var in(const _cpp_break& internal, const ::std::shared_ptr<_cpp_delete>& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr<_cpp_delete>& null, const ::std::optional& _cpp_operator, int override, int params, int _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + var in(const _cpp_break& internal, const ::std::shared_ptr<_cpp_delete>& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr<_cpp_delete>& null, const ::std::optional& _cpp_operator, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future inAsync(const _cpp_break& internal, const ::std::shared_ptr<_cpp_delete>& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr<_cpp_delete>& null, const ::std::optional& _cpp_operator, int override, int params, int _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future inAsync(const _cpp_break& internal, const ::std::shared_ptr<_cpp_delete>& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr<_cpp_delete>& null, const ::std::optional& _cpp_operator, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - inAsync(const _cpp_break& internal, const ::std::shared_ptr<_cpp_delete>& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr<_cpp_delete>& null, const ::std::optional& _cpp_operator, int override, int params, int _cpp_private, + inAsync(const _cpp_break& internal, const ::std::shared_ptr<_cpp_delete>& is, const ::std::optional& lock, const ::std::optional& _cpp_namespace, const ::std::optional& _cpp_new, const ::std::shared_ptr<_cpp_delete>& null, const ::std::optional& _cpp_operator, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_break&, const ::std::shared_ptr<_cpp_delete>&, const ::std::optional&, const ::std::optional&, const ::std::optional&, const ::std::shared_ptr<_cpp_delete>&, const ::std::optional&, int, int, int, const ::Ice::Context&) const; + void _iceI_in(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_break&, const ::std::shared_ptr<_cpp_delete>&, const ::std::optional&, const ::std::optional&, const ::std::optional&, const ::std::shared_ptr<_cpp_delete>&, const ::std::optional&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -624,13 +624,13 @@ namespace await struct _cpp_break { - int _cpp_while; + ::std::int32_t _cpp_while; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_while); } @@ -664,7 +664,7 @@ class _cpp_delete : public ::Ice::ValueHelper<_cpp_delete, ::Ice::Value> /** * One-shot constructor to initialize all data members. */ - _cpp_delete(int _cpp_if, const ::std::optional<::await::casePrx>& _cpp_else, int _cpp_export) : + _cpp_delete(::std::int32_t _cpp_if, const ::std::optional<::await::casePrx>& _cpp_else, ::std::int32_t _cpp_export) : _cpp_if(_cpp_if), _cpp_else(_cpp_else), _cpp_export(_cpp_export) @@ -675,7 +675,7 @@ class _cpp_delete : public ::Ice::ValueHelper<_cpp_delete, ::Ice::Value> * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(_cpp_if, _cpp_else, _cpp_export); } @@ -686,9 +686,9 @@ class _cpp_delete : public ::Ice::ValueHelper<_cpp_delete, ::Ice::Value> */ static const ::std::string& ice_staticId(); - int _cpp_if; + ::std::int32_t _cpp_if; ::std::optional<::await::casePrx> _cpp_else; - int _cpp_export; + ::std::int32_t _cpp_export; }; /// \cond INTERNAL @@ -762,7 +762,7 @@ class fixed : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - fixed(int _cpp_for) : + fixed(::std::int32_t _cpp_for) : _cpp_for(_cpp_for) { } @@ -771,7 +771,7 @@ class fixed : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_for); } @@ -782,7 +782,7 @@ class fixed : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_for; + ::std::int32_t _cpp_for; }; /// \cond INTERNAL @@ -802,7 +802,7 @@ class foreach : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - foreach(int _cpp_for, int _cpp_goto, int _cpp_if) : + foreach(::std::int32_t _cpp_for, ::std::int32_t _cpp_goto, ::std::int32_t _cpp_if) : ::Ice::UserExceptionHelper(_cpp_for), _cpp_goto(_cpp_goto), _cpp_if(_cpp_if) @@ -813,7 +813,7 @@ class foreach : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_for, _cpp_goto, _cpp_if); } @@ -824,8 +824,8 @@ class foreach : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_goto; - int _cpp_if; + ::std::int32_t _cpp_goto; + ::std::int32_t _cpp_if; }; class BaseMethods : public ::Ice::UserExceptionHelper @@ -841,7 +841,7 @@ class BaseMethods : public ::Ice::UserExceptionHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(Data, HelpLink, InnerException, Message, Source, StackTrace, TargetSite, HResult, Equals, GetBaseException, GetHashCode, GetObjectData, GetType, ReferenceEquals, ToString); } @@ -875,21 +875,21 @@ class BaseMethods : public ::Ice::UserExceptionHelper response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void catchAsync(::std::int32_t checked, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_catch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1144,7 +1144,7 @@ class implicit : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual var in(_cpp_break internal, ::std::shared_ptr is, ::std::optional lock, ::std::optional _cpp_namespace, ::std::optional _cpp_new, ::std::shared_ptr null, ::std::optional _cpp_operator, int override, int params, int _cpp_private, const ::Ice::Current& current) = 0; + virtual var in(_cpp_break internal, ::std::shared_ptr is, ::std::optional lock, ::std::optional _cpp_namespace, ::std::optional _cpp_new, ::std::shared_ptr null, ::std::optional _cpp_operator, ::std::int32_t override, ::std::int32_t params, ::std::int32_t _cpp_private, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_in(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/Slice/macros/Test.h b/slice2cpp/js/test/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/js/test/Slice/macros/Test.h +++ b/slice2cpp/js/test/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/js/test/typescript/Ice/acm/Test.cpp b/slice2cpp/js/test/typescript/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/js/test/typescript/Ice/acm/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/js/test/typescript/Ice/acm/Test.h b/slice2cpp/js/test/typescript/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/js/test/typescript/Ice/acm/Test.h +++ b/slice2cpp/js/test/typescript/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/ami/Test.cpp b/slice2cpp/js/test/typescript/Ice/ami/Test.cpp index a15e2a9f0876..f4ee63ad5ac9 100644 --- a/slice2cpp/js/test/typescript/Ice/ami/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/ami/Test.cpp @@ -217,30 +217,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -325,30 +325,30 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -358,19 +358,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -381,7 +381,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -429,19 +429,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -452,7 +452,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -876,7 +876,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -914,7 +914,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -928,7 +928,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -960,7 +960,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); diff --git a/slice2cpp/js/test/typescript/Ice/ami/Test.h b/slice2cpp/js/test/typescript/Ice/ami/Test.h index 9b1042bc2988..dedd10ec29f1 100644 --- a/slice2cpp/js/test/typescript/Ice/ami/Test.h +++ b/slice2cpp/js/test/typescript/Ice/ami/Test.h @@ -160,18 +160,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -202,33 +202,33 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -246,19 +246,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -602,7 +602,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -617,12 +617,12 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -632,7 +632,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/defaultValue/Test.h b/slice2cpp/js/test/typescript/Ice/defaultValue/Test.h index b2d68ec45867..15064099541b 100644 --- a/slice2cpp/js/test/typescript/Ice/defaultValue/Test.h +++ b/slice2cpp/js/test/typescript/Ice/defaultValue/Test.h @@ -71,13 +71,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -97,9 +97,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -109,11 +109,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -124,10 +124,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; @@ -138,8 +138,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -149,7 +149,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -158,10 +158,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -171,8 +171,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -182,7 +182,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -192,10 +192,10 @@ struct Struct3 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; @@ -206,8 +206,8 @@ struct Struct3 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -217,7 +217,7 @@ struct Struct3 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -225,13 +225,13 @@ struct Struct3 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -240,10 +240,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -257,7 +257,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, is, st, dict); } @@ -291,7 +291,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -315,7 +315,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -328,16 +328,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -364,7 +364,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -379,7 +379,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -501,7 +501,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -525,7 +525,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -538,16 +538,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -571,7 +571,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -586,7 +586,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/js/test/typescript/Ice/enums/Test.h b/slice2cpp/js/test/typescript/Ice/enums/Test.h index 4faaa217843e..34fd9564a243 100644 --- a/slice2cpp/js/test/typescript/Ice/enums/Test.h +++ b/slice2cpp/js/test/typescript/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/js/test/typescript/Ice/exceptions/Test.cpp b/slice2cpp/js/test/typescript/Ice/exceptions/Test.cpp index c58467e06384..be54049cb961 100644 --- a/slice2cpp/js/test/typescript/Ice/exceptions/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/exceptions/Test.cpp @@ -249,19 +249,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -272,7 +272,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -298,19 +298,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -321,7 +321,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -351,19 +351,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -374,7 +374,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -400,19 +400,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -423,7 +423,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -449,19 +449,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -472,7 +472,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -498,19 +498,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -521,7 +521,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -547,19 +547,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -570,7 +570,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -596,19 +596,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -619,7 +619,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -631,19 +631,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -654,7 +654,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -666,19 +666,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -689,7 +689,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1249,7 +1249,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1264,7 +1264,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1279,8 +1279,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1295,9 +1295,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1312,8 +1312,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1328,9 +1328,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1345,9 +1345,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1362,7 +1362,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1377,8 +1377,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1393,9 +1393,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/js/test/typescript/Ice/exceptions/Test.h b/slice2cpp/js/test/typescript/Ice/exceptions/Test.h index 220189e46bb0..02e1c200b597 100644 --- a/slice2cpp/js/test/typescript/Ice/exceptions/Test.h +++ b/slice2cpp/js/test/typescript/Ice/exceptions/Test.h @@ -155,154 +155,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -644,7 +644,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -653,7 +653,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -664,7 +664,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -684,7 +684,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -694,7 +694,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -705,7 +705,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -721,7 +721,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -731,7 +731,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -742,7 +742,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -758,7 +758,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -767,7 +767,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -778,7 +778,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -870,52 +870,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/hold/Test.cpp b/slice2cpp/js/test/typescript/Ice/hold/Test.cpp index 9e0f56e0145d..feb78e98de3d 100644 --- a/slice2cpp/js/test/typescript/Ice/hold/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/hold/Test.cpp @@ -61,19 +61,19 @@ const ::std::string iceC_Test_Hold_shutdown_name = "shutdown"; } void -Test::HoldPrx::putOnHold(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context).get(); } ::std::future -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context); } ::std::function -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HoldPrx::putOnHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_putOnHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -127,19 +127,19 @@ Test::HoldPrx::_iceI_waitForHold(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::HoldPrx::setOneway(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOneway(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context).get(); } ::std::future -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context); } ::std::function -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -150,7 +150,7 @@ Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, /// \cond INTERNAL void -Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_setOneway_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -161,31 +161,31 @@ Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -int -Test::HoldPrx::set(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::int32_t +Test::HoldPrx::set(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); } -::std::future -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } ::std::function -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, - ::std::function response, +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } /// \cond INTERNAL void -Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_delay, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hold_set_name); outAsync->invoke(iceC_Test_Hold_set_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -265,7 +265,7 @@ Test::Hold::_iceD_putOnHold(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->putOnHold(iceP_seconds, current); @@ -292,8 +292,8 @@ Test::Hold::_iceD_setOneway(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_expected; + ::std::int32_t iceP_value; + ::std::int32_t iceP_expected; istr->readAll(iceP_value, iceP_expected); inS.endReadParams(); this->setOneway(iceP_value, iceP_expected, current); @@ -308,11 +308,11 @@ Test::Hold::_iceD_set(::IceInternal::Incoming& inS, const ::Ice::Current& curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_delay; + ::std::int32_t iceP_value; + ::std::int32_t iceP_delay; istr->readAll(iceP_value, iceP_delay); inS.endReadParams(); - int ret = this->set(iceP_value, iceP_delay, current); + ::std::int32_t ret = this->set(iceP_value, iceP_delay, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/typescript/Ice/hold/Test.h b/slice2cpp/js/test/typescript/Ice/hold/Test.h index 6767cf758c7e..e02713366f9c 100644 --- a/slice2cpp/js/test/typescript/Ice/hold/Test.h +++ b/slice2cpp/js/test/typescript/Ice/hold/Test.h @@ -48,19 +48,19 @@ class HoldPrx : public ::Ice::Proxy { public: - void putOnHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void putOnHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future putOnHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future putOnHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - putOnHoldAsync(int seconds, + putOnHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitForHold(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -77,34 +77,34 @@ class HoldPrx : public ::Ice::Proxy void _iceI_waitForHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void setOneway(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setOnewayAsync(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setOnewayAsync(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setOnewayAsync(int value, int expected, + setOnewayAsync(::std::int32_t value, ::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int set(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setAsync(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> setAsync(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setAsync(int value, int delay, - ::std::function response, + setAsync(::std::int32_t value, ::std::int32_t delay, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -208,7 +208,7 @@ class Hold : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void putOnHold(int seconds, const ::Ice::Current& current) = 0; + virtual void putOnHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_putOnHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -218,12 +218,12 @@ class Hold : public virtual ::Ice::Object bool _iceD_waitForHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void setOneway(int value, int expected, const ::Ice::Current& current) = 0; + virtual void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int set(int value, int delay, const ::Ice::Current& current) = 0; + virtual ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_set(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/inheritance/Test.h b/slice2cpp/js/test/typescript/Ice/inheritance/Test.h index c214c90f532e..4c09120073b4 100644 --- a/slice2cpp/js/test/typescript/Ice/inheritance/Test.h +++ b/slice2cpp/js/test/typescript/Ice/inheritance/Test.h @@ -721,7 +721,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -730,7 +730,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -741,7 +741,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; /// \cond INTERNAL @@ -764,7 +764,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -774,7 +774,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -785,7 +785,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -804,7 +804,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -814,7 +814,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -825,7 +825,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -844,7 +844,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -854,7 +854,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -865,7 +865,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -889,7 +889,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -898,7 +898,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -909,7 +909,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -928,7 +928,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -938,7 +938,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -949,7 +949,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -968,7 +968,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -978,7 +978,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -989,7 +989,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1008,7 +1008,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1018,7 +1018,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1029,7 +1029,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1053,7 +1053,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1062,7 +1062,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1073,7 +1073,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1092,7 +1092,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1102,7 +1102,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1113,7 +1113,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1132,7 +1132,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1142,7 +1142,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1153,7 +1153,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1172,7 +1172,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1182,7 +1182,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1193,7 +1193,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1217,7 +1217,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1226,7 +1226,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1237,7 +1237,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1256,7 +1256,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1266,7 +1266,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1277,7 +1277,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1296,7 +1296,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1306,7 +1306,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1317,7 +1317,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1336,7 +1336,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1346,7 +1346,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1357,7 +1357,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1381,7 +1381,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1390,7 +1390,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1401,7 +1401,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1420,7 +1420,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1430,7 +1430,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1441,7 +1441,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1460,7 +1460,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1470,7 +1470,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1481,7 +1481,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1500,7 +1500,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1510,7 +1510,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1521,7 +1521,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1545,7 +1545,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1554,7 +1554,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1565,7 +1565,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1584,7 +1584,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1594,7 +1594,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1605,7 +1605,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1624,7 +1624,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1634,7 +1634,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1645,7 +1645,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1664,7 +1664,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1674,7 +1674,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1685,7 +1685,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } diff --git a/slice2cpp/js/test/typescript/Ice/location/Test.cpp b/slice2cpp/js/test/typescript/Ice/location/Test.cpp index 457a88f7cfee..f59447f9b4eb 100644 --- a/slice2cpp/js/test/typescript/Ice/location/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/typescript/Ice/location/Test.h b/slice2cpp/js/test/typescript/Ice/location/Test.h index 54689962018c..5e6f07b7aa2d 100644 --- a/slice2cpp/js/test/typescript/Ice/location/Test.h +++ b/slice2cpp/js/test/typescript/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/objects/Test.h b/slice2cpp/js/test/typescript/Ice/objects/Test.h index 7df6c693439a..e7cfa0b2bf0c 100644 --- a/slice2cpp/js/test/typescript/Ice/objects/Test.h +++ b/slice2cpp/js/test/typescript/Ice/objects/Test.h @@ -102,7 +102,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -120,9 +120,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -920,14 +920,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1210,7 +1210,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1220,7 +1220,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1233,7 +1233,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/js/test/typescript/Ice/operations/Test.cpp b/slice2cpp/js/test/typescript/Ice/operations/Test.cpp index 77b0c1e0db00..d0e7f22388a1 100644 --- a/slice2cpp/js/test/typescript/Ice/operations/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/operations/Test.cpp @@ -487,37 +487,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -528,7 +528,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -583,39 +583,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -626,7 +626,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2584,30 +2584,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2745,31 +2745,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2781,31 +2781,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2817,31 +2817,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2853,31 +2853,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3816,12 +3816,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3854,15 +3854,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4657,7 +4657,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4725,10 +4725,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4742,10 +4742,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4759,10 +4759,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4776,10 +4776,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/typescript/Ice/operations/Test.h b/slice2cpp/js/test/typescript/Ice/operations/Test.h index dd7fbe9e9cca..3b9d7e412be8 100644 --- a/slice2cpp/js/test/typescript/Ice/operations/Test.h +++ b/slice2cpp/js/test/typescript/Ice/operations/Test.h @@ -70,15 +70,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -114,11 +114,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -142,15 +142,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -300,19 +300,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -330,19 +330,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -960,18 +960,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1031,64 +1031,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1693,14 +1693,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1840,11 +1840,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1868,13 +1868,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2443,7 +2443,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2468,22 +2468,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.cpp b/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.cpp index de1a0a7a5861..894d8c5f7566 100644 --- a/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.cpp +++ b/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.cpp @@ -92,19 +92,19 @@ Test::Initial2Prx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::Ice /// \endcond void -Test::Initial2Prx::opVoid(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoid(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context).get(); } ::std::future -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context); } ::std::function -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, ::std::function response, ::std::function ex, ::std::function sent, @@ -115,7 +115,7 @@ Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::opti /// \cond INTERNAL void -Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Initial2_opVoid_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -181,7 +181,7 @@ Test::Initial2::_iceD_opVoid(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_v; istr->readAll({1, 2}, iceP_a, iceP_v); inS.endReadParams(); diff --git a/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.h b/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.h index 04dff1d99466..3a0aff1f3242 100644 --- a/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.h +++ b/slice2cpp/js/test/typescript/Ice/optional/ClientPrivate.h @@ -64,19 +64,19 @@ class Initial2Prx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const std::optional<::std::shared_ptr<::Ice::Value>>&, const ::Ice::Context&) const; /// \endcond - void opVoid(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opVoid(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, + opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const ::Ice::Context&) const; + void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const ::Ice::Context&) const; /// \endcond /** @@ -171,7 +171,7 @@ class Initial2 : public virtual ::Ice::Object bool _iceD_opClassAndUnknownOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opVoid(std::optional a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; + virtual void opVoid(std::optional<::std::int32_t> a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVoid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/optional/Test.cpp b/slice2cpp/js/test/typescript/Ice/optional/Test.cpp index 941c8b0c9d1e..32407e760518 100644 --- a/slice2cpp/js/test/typescript/Ice/optional/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/optional/Test.cpp @@ -339,19 +339,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -362,7 +362,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -388,19 +388,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -411,7 +411,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -437,19 +437,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -460,7 +460,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -485,37 +485,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,7 +526,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -581,37 +581,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -622,44 +622,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -670,44 +670,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -718,7 +718,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -3150,7 +3150,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3167,7 +3167,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3184,7 +3184,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3201,11 +3201,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3237,11 +3237,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3255,11 +3255,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3273,11 +3273,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/typescript/Ice/optional/Test.h b/slice2cpp/js/test/typescript/Ice/optional/Test.h index 3a4b0eae43a7..8d80ed5d6034 100644 --- a/slice2cpp/js/test/typescript/Ice/optional/Test.h +++ b/slice2cpp/js/test/typescript/Ice/optional/Test.h @@ -69,15 +69,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -101,21 +101,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -223,64 +223,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -298,49 +298,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1156,13 +1156,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1170,13 +1170,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1198,13 +1198,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1238,7 +1238,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1247,7 +1247,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1258,7 +1258,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1281,7 +1281,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1319,7 +1319,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1330,11 +1330,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1378,7 +1378,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1390,7 +1390,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1401,10 +1401,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1423,7 +1423,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1434,7 +1434,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1458,8 +1458,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1484,7 +1484,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1495,7 +1495,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1526,7 +1526,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1536,7 +1536,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1547,7 +1547,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1741,7 +1741,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1750,7 +1750,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1761,7 +1761,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1866,7 +1866,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1878,7 +1878,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1890,7 +1890,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1912,7 +1912,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1925,7 +1925,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1955,7 +1955,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1966,7 +1966,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2078,17 +2078,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2098,11 +2098,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2126,11 +2126,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2140,11 +2140,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2154,11 +2154,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/retry/Test.cpp b/slice2cpp/js/test/typescript/Ice/retry/Test.cpp index d86b279793d5..aa5dcac5781d 100644 --- a/slice2cpp/js/test/typescript/Ice/retry/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/retry/Test.cpp @@ -95,31 +95,31 @@ Test::RetryPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); } -::std::future -Test::RetryPrx::opIdempotentAsync(int iceP_c, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); } ::std::function -Test::RetryPrx::opIdempotentAsync(int iceP_c, - ::std::function response, +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); } /// \cond INTERNAL void -Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_c, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Retry_opIdempotent_name); outAsync->invoke(iceC_Test_Retry_opIdempotent_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -276,10 +276,10 @@ Test::Retry::_iceD_opIdempotent(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_c; + ::std::int32_t iceP_c; istr->readAll(iceP_c); inS.endReadParams(); - int ret = this->opIdempotent(iceP_c, current); + ::std::int32_t ret = this->opIdempotent(iceP_c, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/js/test/typescript/Ice/retry/Test.h b/slice2cpp/js/test/typescript/Ice/retry/Test.h index 9ad395ca7e88..988734543418 100644 --- a/slice2cpp/js/test/typescript/Ice/retry/Test.h +++ b/slice2cpp/js/test/typescript/Ice/retry/Test.h @@ -63,19 +63,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - int opIdempotent(int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIdempotentAsync(int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIdempotentAsync(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIdempotentAsync(int c, - ::std::function response, + opIdempotentAsync(::std::int32_t c, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opNotIdempotent(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -212,7 +212,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opIdempotent(int c, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Ice/scope/Test.h b/slice2cpp/js/test/typescript/Ice/scope/Test.h index 06b58770c6e3..d4596c711107 100644 --- a/slice2cpp/js/test/typescript/Ice/scope/Test.h +++ b/slice2cpp/js/test/typescript/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/js/test/typescript/Ice/slicing/objects/Test.h b/slice2cpp/js/test/typescript/Ice/slicing/objects/Test.h index e19b48c9137c..ae6df919a59a 100644 --- a/slice2cpp/js/test/typescript/Ice/slicing/objects/Test.h +++ b/slice2cpp/js/test/typescript/Ice/slicing/objects/Test.h @@ -61,7 +61,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -958,7 +958,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -967,7 +967,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -978,7 +978,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -997,7 +997,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1007,7 +1007,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1056,7 +1056,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1066,7 +1066,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1096,7 +1096,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1106,7 +1106,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1236,7 +1236,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -1246,7 +1246,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -1295,7 +1295,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1305,7 +1305,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -1335,7 +1335,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -1345,7 +1345,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -1356,7 +1356,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -1375,7 +1375,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -1385,7 +1385,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -1415,7 +1415,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1425,7 +1425,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/js/test/typescript/Ice/stream/Test.h b/slice2cpp/js/test/typescript/Ice/stream/Test.h index a1efb3eb34f9..e2be82d93722 100644 --- a/slice2cpp/js/test/typescript/Ice/stream/Test.h +++ b/slice2cpp/js/test/typescript/Ice/stream/Test.h @@ -74,11 +74,11 @@ using MyEnumSS = ::std::vector; using MyClassSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -149,10 +149,10 @@ namespace Test struct SmallStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -163,7 +163,7 @@ struct SmallStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, p); } @@ -197,7 +197,7 @@ class OptionalClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - OptionalClass(bool bo, ::Ice::Byte by, const std::optional& sh, const std::optional& i) : + OptionalClass(bool bo, ::std::uint8_t by, const std::optional<::std::int16_t>& sh, const std::optional<::std::int32_t>& i) : bo(bo), by(by), sh(sh), @@ -209,7 +209,7 @@ class OptionalClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(bo, by, sh, i); } @@ -221,9 +221,9 @@ class OptionalClass : public ::Ice::ValueHelper static const ::std::string& ice_staticId(); bool bo; - ::Ice::Byte by; - std::optional sh; - std::optional i; + ::std::uint8_t by; + std::optional<::std::int16_t> sh; + std::optional<::std::int32_t> i; }; /// \cond INTERNAL diff --git a/slice2cpp/js/test/typescript/Ice/timeout/Test.cpp b/slice2cpp/js/test/typescript/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/js/test/typescript/Ice/timeout/Test.cpp +++ b/slice2cpp/js/test/typescript/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/js/test/typescript/Ice/timeout/Test.h b/slice2cpp/js/test/typescript/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/js/test/typescript/Ice/timeout/Test.h +++ b/slice2cpp/js/test/typescript/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/js/test/typescript/Slice/macros/Test.h b/slice2cpp/js/test/typescript/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/js/test/typescript/Slice/macros/Test.h +++ b/slice2cpp/js/test/typescript/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/matlab/test/Ice/acm/Test.cpp b/slice2cpp/matlab/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/matlab/test/Ice/acm/Test.cpp +++ b/slice2cpp/matlab/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/matlab/test/Ice/acm/Test.h b/slice2cpp/matlab/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/matlab/test/Ice/acm/Test.h +++ b/slice2cpp/matlab/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Ice/ami/Test.cpp b/slice2cpp/matlab/test/Ice/ami/Test.cpp index 4aeeb7be72ac..2d25f8a3bb27 100644 --- a/slice2cpp/matlab/test/Ice/ami/Test.cpp +++ b/slice2cpp/matlab/test/Ice/ami/Test.cpp @@ -246,30 +246,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -354,30 +354,30 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -387,19 +387,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -410,7 +410,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -458,19 +458,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -481,7 +481,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -685,31 +685,31 @@ Test::TestIntfPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -::Ice::Byte -Test::TestIntfPrx::opByte(::Ice::Byte iceP_b, const ::Ice::Context& context) const +::std::uint8_t +Test::TestIntfPrx::opByte(::std::uint8_t iceP_b, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &TestIntfPrx::_iceI_opByte, iceP_b, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &TestIntfPrx::_iceI_opByte, iceP_b, context).get(); } -::std::future<::Ice::Byte> -Test::TestIntfPrx::opByteAsync(::Ice::Byte iceP_b, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::TestIntfPrx::opByteAsync(::std::uint8_t iceP_b, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &TestIntfPrx::_iceI_opByte, iceP_b, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opByte, iceP_b, context); } ::std::function -Test::TestIntfPrx::opByteAsync(::Ice::Byte iceP_b, - ::std::function response, +Test::TestIntfPrx::opByteAsync(::std::uint8_t iceP_b, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opByte, iceP_b, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opByte, iceP_b, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_b, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opByte_name); outAsync->invoke(iceC_Test_TestIntf_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -721,31 +721,31 @@ Test::TestIntfPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::TestIntfPrx::opShort(short iceP_s, const ::Ice::Context& context) const +::std::int16_t +Test::TestIntfPrx::opShort(::std::int16_t iceP_s, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opShort, iceP_s, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &TestIntfPrx::_iceI_opShort, iceP_s, context).get(); } -::std::future -Test::TestIntfPrx::opShortAsync(short iceP_s, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::TestIntfPrx::opShortAsync(::std::int16_t iceP_s, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opShort, iceP_s, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opShort, iceP_s, context); } ::std::function -Test::TestIntfPrx::opShortAsync(short iceP_s, - ::std::function response, +Test::TestIntfPrx::opShortAsync(::std::int16_t iceP_s, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opShort, iceP_s, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opShort, iceP_s, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_s, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_s, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opShort_name); outAsync->invoke(iceC_Test_TestIntf_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -757,31 +757,31 @@ Test::TestIntfPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::TestIntfPrx::opInt(int iceP_i, const ::Ice::Context& context) const +::std::int32_t +Test::TestIntfPrx::opInt(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opInt, iceP_i, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opInt, iceP_i, context).get(); } -::std::future -Test::TestIntfPrx::opIntAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::TestIntfPrx::opIntAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opInt, iceP_i, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opInt, iceP_i, context); } ::std::function -Test::TestIntfPrx::opIntAsync(int iceP_i, - ::std::function response, +Test::TestIntfPrx::opIntAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opInt, iceP_i, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opInt, iceP_i, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opInt_name); outAsync->invoke(iceC_Test_TestIntf_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -793,31 +793,31 @@ Test::TestIntfPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::TestIntfPrx::opLong(long long int iceP_l, const ::Ice::Context& context) const +::std::int64_t +Test::TestIntfPrx::opLong(::std::int64_t iceP_l, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opLong, iceP_l, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &TestIntfPrx::_iceI_opLong, iceP_l, context).get(); } -::std::future -Test::TestIntfPrx::opLongAsync(long long int iceP_l, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::TestIntfPrx::opLongAsync(::std::int64_t iceP_l, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opLong, iceP_l, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opLong, iceP_l, context); } ::std::function -Test::TestIntfPrx::opLongAsync(long long int iceP_l, - ::std::function response, +Test::TestIntfPrx::opLongAsync(::std::int64_t iceP_l, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opLong, iceP_l, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opLong, iceP_l, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_l, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_l, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opLong_name); outAsync->invoke(iceC_Test_TestIntf_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1010,37 +1010,37 @@ Test::TestIntfControllerPrx::ice_staticId() return TestIntfController::ice_staticId(); } -int -Test::Outer::Inner::TestIntfPrx::op(int iceP_i, int& iceP_j, const ::Ice::Context& context) const +::std::int32_t +Test::Outer::Inner::TestIntfPrx::op(::std::int32_t iceP_i, ::std::int32_t& iceP_j, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); iceP_j = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); } ::std::function -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, - ::std::function response, +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); } /// \cond INTERNAL void -Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Outer_Inner_TestIntf_op_name); outAsync->invoke(iceC_Test_Outer_Inner_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1051,7 +1051,7 @@ Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal: nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1211,7 +1211,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1249,7 +1249,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1263,7 +1263,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -1295,7 +1295,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -1391,10 +1391,10 @@ Test::TestIntf::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_b; + ::std::uint8_t iceP_b; istr->readAll(iceP_b); inS.endReadParams(); - ::Ice::Byte ret = this->opByte(iceP_b, current); + ::std::uint8_t ret = this->opByte(iceP_b, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1408,10 +1408,10 @@ Test::TestIntf::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_s; + ::std::int16_t iceP_s; istr->readAll(iceP_s); inS.endReadParams(); - short ret = this->opShort(iceP_s, current); + ::std::int16_t ret = this->opShort(iceP_s, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1425,10 +1425,10 @@ Test::TestIntf::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int ret = this->opInt(iceP_i, current); + ::std::int32_t ret = this->opInt(iceP_i, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1442,10 +1442,10 @@ Test::TestIntf::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_l; + ::std::int64_t iceP_l; istr->readAll(iceP_l); inS.endReadParams(); - long long int ret = this->opLong(iceP_l, current); + ::std::int64_t ret = this->opLong(iceP_l, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1752,11 +1752,11 @@ Test::Outer::Inner::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int iceP_j; - int ret = this->op(iceP_i, iceP_j, current); + ::std::int32_t iceP_j; + ::std::int32_t ret = this->op(iceP_i, iceP_j, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_j, ret); inS.endWriteParams(); diff --git a/slice2cpp/matlab/test/Ice/ami/Test.h b/slice2cpp/matlab/test/Ice/ami/Test.h index 1137d49d0a7f..2eb20c7be117 100644 --- a/slice2cpp/matlab/test/Ice/ami/Test.h +++ b/slice2cpp/matlab/test/Ice/ami/Test.h @@ -186,18 +186,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -228,33 +228,33 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -272,19 +272,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -372,64 +372,64 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByteAsync(::Ice::Byte b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByteAsync(::std::uint8_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte b, - ::std::function response, + opByteAsync(::std::uint8_t b, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort(short s, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort(::std::int16_t s, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShortAsync(short s, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShortAsync(::std::int16_t s, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(short s, - ::std::function response, + opShortAsync(::std::int16_t s, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt(int i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIntAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIntAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(int i, - ::std::function response, + opIntAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong(long long int l, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong(::std::int64_t l, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLongAsync(long long int l, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLongAsync(::std::int64_t l, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(long long int l, - ::std::function response, + opLongAsync(::std::int64_t l, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat(float f, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -615,19 +615,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(int i, int& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> opAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(int i, - ::std::function response, + opAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -810,7 +810,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -825,12 +825,12 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -840,7 +840,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -875,22 +875,22 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBool(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte(::Ice::Byte b, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort(short s, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort(::std::int16_t s, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt(int i, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt(::std::int32_t i, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong(long long int l, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong(::std::int64_t l, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1009,11 +1009,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpResult { - int returnValue; - int j; + ::std::int32_t returnValue; + ::std::int32_t j; }; - virtual int op(int i, int& j, const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Ice/defaultValue/Test.h b/slice2cpp/matlab/test/Ice/defaultValue/Test.h index 8c0831962d72..5b9227e1cbfc 100644 --- a/slice2cpp/matlab/test/Ice/defaultValue/Test.h +++ b/slice2cpp/matlab/test/Ice/defaultValue/Test.h @@ -70,13 +70,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -96,9 +96,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -108,11 +108,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -123,10 +123,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -137,8 +137,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -148,7 +148,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -157,10 +157,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -170,8 +170,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -181,7 +181,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -189,13 +189,13 @@ struct Struct2 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -204,10 +204,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -221,7 +221,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, is, st, dict); } @@ -255,7 +255,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -279,7 +279,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -292,16 +292,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -328,7 +328,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -343,7 +343,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -465,7 +465,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -489,7 +489,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -502,16 +502,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -535,7 +535,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -550,7 +550,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/matlab/test/Ice/enums/Test.h b/slice2cpp/matlab/test/Ice/enums/Test.h index 2a0b5da8f18d..83abf5f1e817 100644 --- a/slice2cpp/matlab/test/Ice/enums/Test.h +++ b/slice2cpp/matlab/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/matlab/test/Ice/exceptions/Test.cpp b/slice2cpp/matlab/test/Ice/exceptions/Test.cpp index bd6a59049f3b..afae6a99cf6c 100644 --- a/slice2cpp/matlab/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/matlab/test/Ice/exceptions/Test.cpp @@ -236,19 +236,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -259,7 +259,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -285,19 +285,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -308,7 +308,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -338,19 +338,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -361,7 +361,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -387,19 +387,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -410,7 +410,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -436,19 +436,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -459,7 +459,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -485,19 +485,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -508,7 +508,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -534,19 +534,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -557,7 +557,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -583,19 +583,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -606,7 +606,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -632,19 +632,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -655,7 +655,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -667,19 +667,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -690,7 +690,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -702,19 +702,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -725,7 +725,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1188,7 +1188,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1203,7 +1203,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1218,8 +1218,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1234,9 +1234,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1251,8 +1251,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1267,9 +1267,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1284,9 +1284,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1301,8 +1301,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); this->throwModA(iceP_a, iceP_a2, current); @@ -1317,7 +1317,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1332,8 +1332,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1348,9 +1348,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/matlab/test/Ice/exceptions/Test.h b/slice2cpp/matlab/test/Ice/exceptions/Test.h index 358ff5cb7363..99dc913a63cb 100644 --- a/slice2cpp/matlab/test/Ice/exceptions/Test.h +++ b/slice2cpp/matlab/test/Ice/exceptions/Test.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -558,7 +558,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -567,7 +567,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -578,7 +578,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -598,7 +598,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -608,7 +608,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -619,7 +619,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -635,7 +635,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -645,7 +645,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -656,7 +656,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -672,7 +672,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -681,7 +681,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -692,7 +692,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; class E : public ::Ice::UserExceptionHelper @@ -788,7 +788,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -798,7 +798,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -809,7 +809,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -903,57 +903,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModA(int a, int a2, const ::Ice::Current& current) = 0; + virtual void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Ice/objects/LocalTest.h b/slice2cpp/matlab/test/Ice/objects/LocalTest.h index ef1c7c17e715..ed3bf6271783 100644 --- a/slice2cpp/matlab/test/Ice/objects/LocalTest.h +++ b/slice2cpp/matlab/test/Ice/objects/LocalTest.h @@ -58,9 +58,9 @@ using C1Seq = ::std::vector<::std::shared_ptr>; using S1Seq = ::std::vector; -using C1Dict = ::std::map>; +using C1Dict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using S1Dict = ::std::map; +using S1Dict = ::std::map<::std::int32_t, S1>; using C1SeqSeq = ::std::vector; @@ -70,9 +70,9 @@ using StructDict1 = ::std::map>; using StructDict2 = ::std::map; -using C1DictDict = ::std::map; +using C1DictDict = ::std::map<::std::int32_t, C1Dict>; -using S1DictDict = ::std::map; +using S1DictDict = ::std::map<::std::int32_t, S1Dict>; } @@ -193,14 +193,14 @@ struct S8 struct StructKey { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -234,7 +234,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -243,7 +243,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -254,7 +254,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/matlab/test/Ice/objects/Test.h b/slice2cpp/matlab/test/Ice/objects/Test.h index dfbd6b5d5757..9e5aa44a066b 100644 --- a/slice2cpp/matlab/test/Ice/objects/Test.h +++ b/slice2cpp/matlab/test/Ice/objects/Test.h @@ -98,7 +98,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -116,9 +116,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -837,14 +837,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1127,7 +1127,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1137,7 +1137,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1150,7 +1150,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/matlab/test/Ice/operations/Test.cpp b/slice2cpp/matlab/test/Ice/operations/Test.cpp index e907a81581ef..b3c3fbe10cdd 100644 --- a/slice2cpp/matlab/test/Ice/operations/Test.cpp +++ b/slice2cpp/matlab/test/Ice/operations/Test.cpp @@ -462,37 +462,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -503,7 +503,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -558,39 +558,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -601,7 +601,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2559,30 +2559,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2720,31 +2720,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2756,31 +2756,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2792,31 +2792,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2828,31 +2828,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3608,12 +3608,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3646,15 +3646,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4449,7 +4449,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4517,10 +4517,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4534,10 +4534,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4551,10 +4551,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4568,10 +4568,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/matlab/test/Ice/operations/Test.h b/slice2cpp/matlab/test/Ice/operations/Test.h index 50dc9303037b..ff133caaca12 100644 --- a/slice2cpp/matlab/test/Ice/operations/Test.h +++ b/slice2cpp/matlab/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -108,11 +108,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -136,15 +136,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -312,19 +312,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -342,19 +342,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -972,18 +972,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1043,64 +1043,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1569,14 +1569,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1751,11 +1751,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1779,13 +1779,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2354,7 +2354,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2379,22 +2379,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Ice/optional/ClientPrivate.cpp b/slice2cpp/matlab/test/Ice/optional/ClientPrivate.cpp index 1712dac86f2e..fd3fd9fafbd6 100644 --- a/slice2cpp/matlab/test/Ice/optional/ClientPrivate.cpp +++ b/slice2cpp/matlab/test/Ice/optional/ClientPrivate.cpp @@ -94,19 +94,19 @@ Test::Initial2Prx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::Ice /// \endcond void -Test::Initial2Prx::opVoid(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoid(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context).get(); } ::std::future -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context); } ::std::function -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, ::std::function response, ::std::function ex, ::std::function sent, @@ -117,7 +117,7 @@ Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::opti /// \cond INTERNAL void -Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Initial2_opVoid_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -194,7 +194,7 @@ Test::Initial2::_iceD_opVoid(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_v; istr->readAll({1, 2}, iceP_a, iceP_v); inS.endReadParams(); diff --git a/slice2cpp/matlab/test/Ice/optional/ClientPrivate.h b/slice2cpp/matlab/test/Ice/optional/ClientPrivate.h index 88e8d67bb2ca..9f25253808c6 100644 --- a/slice2cpp/matlab/test/Ice/optional/ClientPrivate.h +++ b/slice2cpp/matlab/test/Ice/optional/ClientPrivate.h @@ -65,19 +65,19 @@ class Initial2Prx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const std::optional<::std::shared_ptr<::Ice::Value>>&, const ::Ice::Context&) const; /// \endcond - void opVoid(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opVoid(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, + opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const ::Ice::Context&) const; + void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const ::Ice::Context&) const; /// \endcond /** @@ -149,7 +149,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : + D(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ds(ds), seq(seq), @@ -161,7 +161,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ds, seq, ao); } @@ -225,7 +225,7 @@ class Initial2 : public virtual ::Ice::Object bool _iceD_opClassAndUnknownOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opVoid(std::optional a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; + virtual void opVoid(std::optional<::std::int32_t> a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVoid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Ice/optional/Test.cpp b/slice2cpp/matlab/test/Ice/optional/Test.cpp index ebc5eba2aedf..021e7f325e2b 100644 --- a/slice2cpp/matlab/test/Ice/optional/Test.cpp +++ b/slice2cpp/matlab/test/Ice/optional/Test.cpp @@ -318,19 +318,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -341,7 +341,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -367,19 +367,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -390,7 +390,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -416,19 +416,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -439,7 +439,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -464,37 +464,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -505,7 +505,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -560,37 +560,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -601,44 +601,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -649,44 +649,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -697,7 +697,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2999,7 +2999,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3016,7 +3016,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3033,7 +3033,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3050,11 +3050,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3086,11 +3086,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3104,11 +3104,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3122,11 +3122,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/matlab/test/Ice/optional/Test.h b/slice2cpp/matlab/test/Ice/optional/Test.h index 19617421c833..51f9380f8255 100644 --- a/slice2cpp/matlab/test/Ice/optional/Test.h +++ b/slice2cpp/matlab/test/Ice/optional/Test.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,21 +97,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -219,64 +219,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -294,49 +294,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1044,13 +1044,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1058,13 +1058,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1086,13 +1086,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1126,7 +1126,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1135,7 +1135,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1146,7 +1146,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1169,7 +1169,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1207,7 +1207,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1218,11 +1218,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1266,7 +1266,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1278,7 +1278,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1289,10 +1289,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1311,7 +1311,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1322,7 +1322,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1346,8 +1346,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1372,7 +1372,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1383,7 +1383,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1414,7 +1414,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1424,7 +1424,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1435,7 +1435,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1629,7 +1629,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1638,7 +1638,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1649,7 +1649,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1754,7 +1754,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1766,7 +1766,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1778,7 +1778,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1800,7 +1800,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1813,7 +1813,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1843,7 +1843,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1854,7 +1854,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1966,17 +1966,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1986,11 +1986,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2014,11 +2014,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2028,11 +2028,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2042,11 +2042,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/matlab/test/Ice/slicing/objects/ClientPrivate.h index 66b3ca39a43f..8896cf8397ab 100644 --- a/slice2cpp/matlab/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/matlab/test/Ice/slicing/objects/ClientPrivate.h @@ -61,7 +61,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -958,7 +958,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -967,7 +967,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -978,7 +978,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -997,7 +997,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1007,7 +1007,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1056,7 +1056,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1066,7 +1066,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1096,7 +1096,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1106,7 +1106,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1236,7 +1236,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -1246,7 +1246,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -1295,7 +1295,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1305,7 +1305,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -1335,7 +1335,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -1345,7 +1345,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -1356,7 +1356,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -1375,7 +1375,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -1385,7 +1385,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -1415,7 +1415,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -1425,7 +1425,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/matlab/test/Ice/timeout/Test.cpp b/slice2cpp/matlab/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/matlab/test/Ice/timeout/Test.cpp +++ b/slice2cpp/matlab/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/matlab/test/Ice/timeout/Test.h b/slice2cpp/matlab/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/matlab/test/Ice/timeout/Test.h +++ b/slice2cpp/matlab/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/matlab/test/Slice/escape/Test.h b/slice2cpp/matlab/test/Slice/escape/Test.h index 1aa65513f08e..cef7f27941de 100644 --- a/slice2cpp/matlab/test/Slice/escape/Test.h +++ b/slice2cpp/matlab/test/Slice/escape/Test.h @@ -91,9 +91,9 @@ enum class _cpp_bitand : unsigned char using parfor = ::std::vector<_cpp_bitor>; -using _cpp_switch = ::std::map; +using _cpp_switch = ::std::map<::std::int32_t, _cpp_bitor>; -constexpr int methods = 1; +constexpr ::std::int32_t methods = 1; } @@ -226,15 +226,15 @@ namespace _cpp_break struct _cpp_bitor { ::classdef::_cpp_break::_cpp_bitand _cpp_case = ::classdef::_cpp_break::_cpp_bitand::_cpp_catch; - int _cpp_continue = 1; - int eq = 2; - int ne = 3; + ::std::int32_t _cpp_continue = 1; + ::std::int32_t eq = 2; + ::std::int32_t ne = 3; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_case, _cpp_continue, eq, ne); } @@ -327,7 +327,7 @@ class _cpp_xor : public ::Ice::ValueHelper<_cpp_xor, logical> /** * One-shot constructor to initialize all data members. */ - _cpp_xor(::classdef::_cpp_break::_cpp_bitand _cpp_else, const ::classdef::_cpp_break::_cpp_bitor& _cpp_for, bool int64, int _cpp_return) : + _cpp_xor(::classdef::_cpp_break::_cpp_bitand _cpp_else, const ::classdef::_cpp_break::_cpp_bitor& _cpp_for, bool int64, ::std::int32_t _cpp_return) : Ice::ValueHelper<_cpp_xor, logical>(_cpp_else, _cpp_for, int64), _cpp_return(_cpp_return) { @@ -337,7 +337,7 @@ class _cpp_xor : public ::Ice::ValueHelper<_cpp_xor, logical> * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_else, _cpp_for, int64, _cpp_return); } @@ -348,7 +348,7 @@ class _cpp_xor : public ::Ice::ValueHelper<_cpp_xor, logical> */ static const ::std::string& ice_staticId(); - int _cpp_return = 1; + ::std::int32_t _cpp_return = 1; }; class _cpp_try : public ::Ice::ValueHelper<_cpp_try, ::Ice::Value> @@ -367,7 +367,7 @@ class _cpp_try : public ::Ice::ValueHelper<_cpp_try, ::Ice::Value> /** * One-shot constructor to initialize all data members. */ - _cpp_try(int _cpp_while, int _cpp_delete) : + _cpp_try(::std::int32_t _cpp_while, ::std::int32_t _cpp_delete) : _cpp_while(_cpp_while), _cpp_delete(_cpp_delete) { @@ -377,7 +377,7 @@ class _cpp_try : public ::Ice::ValueHelper<_cpp_try, ::Ice::Value> * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_while, _cpp_delete); } @@ -388,8 +388,8 @@ class _cpp_try : public ::Ice::ValueHelper<_cpp_try, ::Ice::Value> */ static const ::std::string& ice_staticId(); - int _cpp_while = 1; - int _cpp_delete = 2; + ::std::int32_t _cpp_while = 1; + ::std::int32_t _cpp_delete = 2; }; class properties : public ::Ice::ValueHelper @@ -408,7 +408,7 @@ class properties : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - properties(int _cpp_while, int _cpp_delete, int _cpp_if, const ::std::shared_ptr<::classdef::_cpp_break::_cpp_xor>& _cpp_catch, const ::classdef::_cpp_break::parfor& spmd, const ::classdef::_cpp_break::_cpp_switch& otherwise) : + properties(::std::int32_t _cpp_while, ::std::int32_t _cpp_delete, ::std::int32_t _cpp_if, const ::std::shared_ptr<::classdef::_cpp_break::_cpp_xor>& _cpp_catch, const ::classdef::_cpp_break::parfor& spmd, const ::classdef::_cpp_break::_cpp_switch& otherwise) : Ice::ValueHelper(_cpp_while, _cpp_delete), _cpp_if(_cpp_if), _cpp_catch(_cpp_catch), @@ -421,7 +421,7 @@ class properties : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::classdef::_cpp_break::parfor&, const ::classdef::_cpp_break::_cpp_switch&> ice_tuple() const + std::tuple&, const ::classdef::_cpp_break::parfor&, const ::classdef::_cpp_break::_cpp_switch&> ice_tuple() const { return std::tie(_cpp_while, _cpp_delete, _cpp_if, _cpp_catch, spmd, otherwise); } @@ -432,7 +432,7 @@ class properties : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int _cpp_if = 2; + ::std::int32_t _cpp_if = 2; ::std::shared_ptr<::classdef::break::xor> _cpp_catch; ::classdef::_cpp_break::parfor spmd; ::classdef::_cpp_break::_cpp_switch otherwise; @@ -515,7 +515,7 @@ class global : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - global(const ::std::string& identifier, const ::std::string& message, const ::std::string& stack, const ::std::string& cause, const ::std::string& type, const ::std::shared_ptr& end, int enumeration) : + global(const ::std::string& identifier, const ::std::string& message, const ::std::string& stack, const ::std::string& cause, const ::std::string& type, const ::std::shared_ptr& end, ::std::int32_t enumeration) : ::Ice::UserExceptionHelper(identifier, message, stack, cause, type, end), enumeration(enumeration) { @@ -525,7 +525,7 @@ class global : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(identifier, message, stack, cause, type, end, enumeration); } @@ -536,7 +536,7 @@ class global : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int enumeration = 1; + ::std::int32_t enumeration = 1; }; } diff --git a/slice2cpp/php/test/Ice/acm/Test.cpp b/slice2cpp/php/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/php/test/Ice/acm/Test.cpp +++ b/slice2cpp/php/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/php/test/Ice/acm/Test.h b/slice2cpp/php/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/php/test/Ice/acm/Test.h +++ b/slice2cpp/php/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Ice/defaultValue/Test.h b/slice2cpp/php/test/Ice/defaultValue/Test.h index 8c0831962d72..5b9227e1cbfc 100644 --- a/slice2cpp/php/test/Ice/defaultValue/Test.h +++ b/slice2cpp/php/test/Ice/defaultValue/Test.h @@ -70,13 +70,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -96,9 +96,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -108,11 +108,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -123,10 +123,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -137,8 +137,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -148,7 +148,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -157,10 +157,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -170,8 +170,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -181,7 +181,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -189,13 +189,13 @@ struct Struct2 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -204,10 +204,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -221,7 +221,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, is, st, dict); } @@ -255,7 +255,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -279,7 +279,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -292,16 +292,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -328,7 +328,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -343,7 +343,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -465,7 +465,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -489,7 +489,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -502,16 +502,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -535,7 +535,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -550,7 +550,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/php/test/Ice/enums/Test.h b/slice2cpp/php/test/Ice/enums/Test.h index 4faaa217843e..34fd9564a243 100644 --- a/slice2cpp/php/test/Ice/enums/Test.h +++ b/slice2cpp/php/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/php/test/Ice/exceptions/Test.cpp b/slice2cpp/php/test/Ice/exceptions/Test.cpp index f23268d7801a..feb76aadbc0b 100644 --- a/slice2cpp/php/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/php/test/Ice/exceptions/Test.cpp @@ -188,19 +188,19 @@ Test::ThrowerPrx::_iceI_supportsUndeclaredExceptions(const ::std::shared_ptr<::I /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -211,7 +211,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -237,19 +237,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -260,7 +260,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -290,19 +290,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -313,7 +313,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -339,19 +339,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -362,7 +362,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -388,19 +388,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -411,7 +411,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -437,19 +437,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -460,7 +460,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -486,19 +486,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -509,7 +509,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -535,19 +535,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -558,7 +558,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -570,19 +570,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -593,7 +593,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -605,19 +605,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -628,7 +628,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -937,7 +937,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -952,7 +952,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -967,8 +967,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -983,9 +983,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1000,8 +1000,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1016,9 +1016,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1033,9 +1033,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1050,7 +1050,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1065,8 +1065,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1081,9 +1081,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/php/test/Ice/exceptions/Test.h b/slice2cpp/php/test/Ice/exceptions/Test.h index 586cf3efb624..58af96f96c91 100644 --- a/slice2cpp/php/test/Ice/exceptions/Test.h +++ b/slice2cpp/php/test/Ice/exceptions/Test.h @@ -137,154 +137,154 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsUndeclaredExceptions(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -476,7 +476,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -485,7 +485,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -496,7 +496,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -516,7 +516,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -526,7 +526,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -537,7 +537,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -553,7 +553,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -563,7 +563,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -574,7 +574,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -590,7 +590,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -599,7 +599,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -610,7 +610,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; } @@ -697,52 +697,52 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsUndeclaredExceptions(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Ice/objects/Test.h b/slice2cpp/php/test/Ice/objects/Test.h index 1d45fdd099b4..01131000bc91 100644 --- a/slice2cpp/php/test/Ice/objects/Test.h +++ b/slice2cpp/php/test/Ice/objects/Test.h @@ -82,15 +82,15 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; using ValueSeq = ::std::vector<::std::shared_ptr<::Ice::Value>>; using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -1013,7 +1013,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1023,7 +1023,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1036,7 +1036,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/php/test/Ice/operations/Test.cpp b/slice2cpp/php/test/Ice/operations/Test.cpp index 14b96abee717..2d9b2e662057 100644 --- a/slice2cpp/php/test/Ice/operations/Test.cpp +++ b/slice2cpp/php/test/Ice/operations/Test.cpp @@ -436,37 +436,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -477,7 +477,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -532,39 +532,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -575,7 +575,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2448,31 +2448,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2484,31 +2484,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2520,31 +2520,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2556,31 +2556,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3325,12 +3325,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3363,15 +3363,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4132,10 +4132,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4149,10 +4149,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4166,10 +4166,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4183,10 +4183,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/php/test/Ice/operations/Test.h b/slice2cpp/php/test/Ice/operations/Test.h index 3c66d0e92ace..2eed2bb18018 100644 --- a/slice2cpp/php/test/Ice/operations/Test.h +++ b/slice2cpp/php/test/Ice/operations/Test.h @@ -64,15 +64,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -104,11 +104,11 @@ using MyEnumSS = ::std::vector; using MyClassSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -128,15 +128,15 @@ using StringMyEnumDS = ::std::vector; using MyEnumStringDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -286,19 +286,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -316,19 +316,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -928,64 +928,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1586,11 +1586,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1614,13 +1614,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2157,22 +2157,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Ice/optional/ClientPrivate.cpp b/slice2cpp/php/test/Ice/optional/ClientPrivate.cpp index 1712dac86f2e..fd3fd9fafbd6 100644 --- a/slice2cpp/php/test/Ice/optional/ClientPrivate.cpp +++ b/slice2cpp/php/test/Ice/optional/ClientPrivate.cpp @@ -94,19 +94,19 @@ Test::Initial2Prx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::Ice /// \endcond void -Test::Initial2Prx::opVoid(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoid(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context).get(); } ::std::future -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context); } ::std::function -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, ::std::function response, ::std::function ex, ::std::function sent, @@ -117,7 +117,7 @@ Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::opti /// \cond INTERNAL void -Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Initial2_opVoid_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -194,7 +194,7 @@ Test::Initial2::_iceD_opVoid(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_v; istr->readAll({1, 2}, iceP_a, iceP_v); inS.endReadParams(); diff --git a/slice2cpp/php/test/Ice/optional/ClientPrivate.h b/slice2cpp/php/test/Ice/optional/ClientPrivate.h index 88e8d67bb2ca..9f25253808c6 100644 --- a/slice2cpp/php/test/Ice/optional/ClientPrivate.h +++ b/slice2cpp/php/test/Ice/optional/ClientPrivate.h @@ -65,19 +65,19 @@ class Initial2Prx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const std::optional<::std::shared_ptr<::Ice::Value>>&, const ::Ice::Context&) const; /// \endcond - void opVoid(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opVoid(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, + opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const ::Ice::Context&) const; + void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const ::Ice::Context&) const; /// \endcond /** @@ -149,7 +149,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : + D(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ds(ds), seq(seq), @@ -161,7 +161,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ds, seq, ao); } @@ -225,7 +225,7 @@ class Initial2 : public virtual ::Ice::Object bool _iceD_opClassAndUnknownOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opVoid(std::optional a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; + virtual void opVoid(std::optional<::std::int32_t> a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVoid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Ice/optional/Test.cpp b/slice2cpp/php/test/Ice/optional/Test.cpp index d927f915c712..3970a836a58e 100644 --- a/slice2cpp/php/test/Ice/optional/Test.cpp +++ b/slice2cpp/php/test/Ice/optional/Test.cpp @@ -314,19 +314,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -337,7 +337,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -363,19 +363,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -386,7 +386,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -412,19 +412,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -435,7 +435,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -460,37 +460,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -501,7 +501,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -556,37 +556,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -597,44 +597,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -645,44 +645,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -693,7 +693,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2953,7 +2953,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2970,7 +2970,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -2987,7 +2987,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3004,11 +3004,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3040,11 +3040,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3058,11 +3058,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3076,11 +3076,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/php/test/Ice/optional/Test.h b/slice2cpp/php/test/Ice/optional/Test.h index 967a6bc25536..97f3b7dea487 100644 --- a/slice2cpp/php/test/Ice/optional/Test.h +++ b/slice2cpp/php/test/Ice/optional/Test.h @@ -64,15 +64,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -96,21 +96,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; } @@ -216,64 +216,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -291,49 +291,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1027,13 +1027,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1041,13 +1041,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1069,13 +1069,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1109,7 +1109,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1118,7 +1118,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1129,7 +1129,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1152,7 +1152,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1190,7 +1190,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1201,11 +1201,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1249,7 +1249,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1261,7 +1261,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1272,10 +1272,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1294,7 +1294,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1305,7 +1305,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1329,8 +1329,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1355,7 +1355,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1366,7 +1366,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1397,7 +1397,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1407,7 +1407,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1418,7 +1418,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1612,7 +1612,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1621,7 +1621,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1632,7 +1632,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1698,7 +1698,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1710,7 +1710,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1722,7 +1722,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1744,7 +1744,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1757,7 +1757,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1787,7 +1787,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1798,7 +1798,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1910,17 +1910,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1930,11 +1930,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1958,11 +1958,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1972,11 +1972,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1986,11 +1986,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Ice/scope/Test.h b/slice2cpp/php/test/Ice/scope/Test.h index 06b58770c6e3..d4596c711107 100644 --- a/slice2cpp/php/test/Ice/scope/Test.h +++ b/slice2cpp/php/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/php/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/php/test/Ice/slicing/objects/ClientPrivate.h index e09124ade434..3d94a6123b1b 100644 --- a/slice2cpp/php/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/php/test/Ice/slicing/objects/ClientPrivate.h @@ -104,7 +104,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -114,7 +114,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -163,7 +163,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -173,7 +173,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -203,7 +203,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -213,7 +213,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -224,7 +224,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -243,7 +243,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -253,7 +253,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -283,7 +283,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -293,7 +293,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/php/test/Ice/slicing/objects/Test.h b/slice2cpp/php/test/Ice/slicing/objects/Test.h index 83914be23c07..55cff72d32e4 100644 --- a/slice2cpp/php/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/php/test/Ice/slicing/objects/Test.h @@ -55,7 +55,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -952,7 +952,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -961,7 +961,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -972,7 +972,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -991,7 +991,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1001,7 +1001,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1050,7 +1050,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1060,7 +1060,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1090,7 +1090,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1100,7 +1100,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/php/test/Ice/timeout/Test.cpp b/slice2cpp/php/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/php/test/Ice/timeout/Test.cpp +++ b/slice2cpp/php/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/php/test/Ice/timeout/Test.h b/slice2cpp/php/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/php/test/Ice/timeout/Test.h +++ b/slice2cpp/php/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Slice/escape/Clash.h b/slice2cpp/php/test/Slice/escape/Clash.h index 03cfb3ff6ea9..316cf7e416e9 100644 --- a/slice2cpp/php/test/Slice/escape/Clash.h +++ b/slice2cpp/php/test/Slice/escape/Clash.h @@ -275,16 +275,16 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; ::std::string other; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs, other); } @@ -318,7 +318,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, const ::std::string& upCast, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, const ::std::string& upCast, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : s(s), context(context), current(current), @@ -341,7 +341,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const ::std::string&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, upCast, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy); } @@ -354,14 +354,14 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; + ::std::int32_t current; + ::std::int16_t response; ::std::string upCast; - int typeId; - short del; - std::optional cookie; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; @@ -391,7 +391,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr) : + Ex(::std::int16_t istr, ::std::int32_t ostr) : istr(istr), ostr(ostr) { @@ -401,7 +401,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr); } @@ -412,8 +412,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; }; /// \cond INTERNAL diff --git a/slice2cpp/php/test/Slice/escape/Key.cpp b/slice2cpp/php/test/Slice/escape/Key.cpp index f0a1b357ec29..ebef38293c04 100644 --- a/slice2cpp/php/test/Slice/escape/Key.cpp +++ b/slice2cpp/php/test/Slice/escape/Key.cpp @@ -121,30 +121,30 @@ const ::std::string iceC_and_for_foreach_name = "foreach"; } void -_cpp_and::breakPrx::_cpp_case(int iceP_catch, int& iceP_try, const ::Ice::Context& context) const +_cpp_and::breakPrx::_cpp_case(::std::int32_t iceP_catch, ::std::int32_t& iceP_try, const ::Ice::Context& context) const { - iceP_try = _makePromiseOutgoing(true, this, &breakPrx::_iceI_case, iceP_catch, context).get(); + iceP_try = _makePromiseOutgoing<::std::int32_t>(true, this, &breakPrx::_iceI_case, iceP_catch, context).get(); } -::std::future -_cpp_and::breakPrx::caseAsync(int iceP_catch, const ::Ice::Context& context) const +::std::future<::std::int32_t> +_cpp_and::breakPrx::caseAsync(::std::int32_t iceP_catch, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &breakPrx::_iceI_case, iceP_catch, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &breakPrx::_iceI_case, iceP_catch, context); } ::std::function -_cpp_and::breakPrx::caseAsync(int iceP_catch, - ::std::function response, +_cpp_and::breakPrx::caseAsync(::std::int32_t iceP_catch, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &_cpp_and::breakPrx::_iceI_case, iceP_catch, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &_cpp_and::breakPrx::_iceI_case, iceP_catch, context); } /// \cond INTERNAL void -_cpp_and::breakPrx::_iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_catch, const ::Ice::Context& context) const +_cpp_and::breakPrx::_iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_catch, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_and_break_case_name); outAsync->invoke(iceC_and_break_case_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -163,19 +163,19 @@ _cpp_and::breakPrx::ice_staticId() } void -_cpp_and::functionPrx::_cpp_continue(int iceP_declare, int iceP_default, const ::Ice::Context& context) const +_cpp_and::functionPrx::_cpp_continue(::std::int32_t iceP_declare, ::std::int32_t iceP_default, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &functionPrx::_iceI_continue, iceP_declare, iceP_default, context).get(); } ::std::future -_cpp_and::functionPrx::continueAsync(int iceP_declare, int iceP_default, const ::Ice::Context& context) const +_cpp_and::functionPrx::continueAsync(::std::int32_t iceP_declare, ::std::int32_t iceP_default, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &functionPrx::_iceI_continue, iceP_declare, iceP_default, context); } ::std::function -_cpp_and::functionPrx::continueAsync(int iceP_declare, int iceP_default, +_cpp_and::functionPrx::continueAsync(::std::int32_t iceP_declare, ::std::int32_t iceP_default, ::std::function response, ::std::function ex, ::std::function sent, @@ -186,7 +186,7 @@ _cpp_and::functionPrx::continueAsync(int iceP_declare, int iceP_default, /// \cond INTERNAL void -_cpp_and::functionPrx::_iceI_continue(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_declare, int iceP_default, const ::Ice::Context& context) const +_cpp_and::functionPrx::_iceI_continue(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_declare, ::std::int32_t iceP_default, const ::Ice::Context& context) const { outAsync->invoke(iceC_and_function_continue_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -247,19 +247,19 @@ _cpp_and::enddeclarePrx::ice_staticId() } ::_cpp_and::array -_cpp_and::forPrx::foreach(const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, int iceP_new, int iceP_static, const ::Ice::Context& context) const +_cpp_and::forPrx::foreach(const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, ::std::int32_t iceP_new, ::std::int32_t iceP_static, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &forPrx::_iceI_foreach, iceP_if, iceP_global, iceP_include, iceP_return, iceP_list, iceP_new, iceP_static, context).get(); } ::std::future<::_cpp_and::array> -_cpp_and::forPrx::foreachAsync(const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, int iceP_new, int iceP_static, const ::Ice::Context& context) const +_cpp_and::forPrx::foreachAsync(const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, ::std::int32_t iceP_new, ::std::int32_t iceP_static, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &forPrx::_iceI_foreach, iceP_if, iceP_global, iceP_include, iceP_return, iceP_list, iceP_new, iceP_static, context); } ::std::function -_cpp_and::forPrx::foreachAsync(const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, int iceP_new, int iceP_static, +_cpp_and::forPrx::foreachAsync(const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, ::std::int32_t iceP_new, ::std::int32_t iceP_static, ::std::function response, ::std::function ex, ::std::function sent, @@ -270,7 +270,7 @@ _cpp_and::forPrx::foreachAsync(const ::std::optional& iceP_if, const : /// \cond INTERNAL void -_cpp_and::forPrx::_iceI_foreach(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, int iceP_new, int iceP_static, const ::Ice::Context& context) const +_cpp_and::forPrx::_iceI_foreach(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_global, const ::std::optional& iceP_include, const ::std::optional& iceP_return, const ::std::optional& iceP_list, ::std::int32_t iceP_new, ::std::int32_t iceP_static, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_and_for_foreach_name); outAsync->invoke(iceC_and_for_foreach_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -370,10 +370,10 @@ _cpp_and::_cpp_break::_iceD_case(::IceInternal::Incoming& inS, const ::Ice::Curr { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_catch; + ::std::int32_t iceP_catch; istr->readAll(iceP_catch); inS.endReadParams(); - int iceP_try; + ::std::int32_t iceP_try; this->_cpp_case(iceP_catch, iceP_try, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_try); @@ -454,8 +454,8 @@ _cpp_and::function::_iceD_continue(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_declare; - int iceP_default; + ::std::int32_t iceP_declare; + ::std::int32_t iceP_default; istr->readAll(iceP_declare, iceP_default); inS.endReadParams(); this->_cpp_continue(iceP_declare, iceP_default, current); @@ -689,8 +689,8 @@ _cpp_and::_cpp_for::_iceD_foreach(::IceInternal::Incoming& inS, const ::Ice::Cur ::std::optional iceP_include; ::std::optional iceP_return; ::std::optional iceP_list; - int iceP_new; - int iceP_static; + ::std::int32_t iceP_new; + ::std::int32_t iceP_static; istr->readAll(iceP_if, iceP_global, iceP_include, iceP_return, iceP_list, iceP_new, iceP_static); istr->readPendingValues(); inS.endReadParams(); diff --git a/slice2cpp/php/test/Slice/escape/Key.h b/slice2cpp/php/test/Slice/escape/Key.h index 1b0579866b81..384733a08f2c 100644 --- a/slice2cpp/php/test/Slice/escape/Key.h +++ b/slice2cpp/php/test/Slice/escape/Key.h @@ -66,11 +66,11 @@ using endfor = ::std::vector; using endforeach = ::std::map<::std::string, array>; -constexpr int _cpp_or = 0; +constexpr ::std::int32_t _cpp_or = 0; -constexpr int print = 0; +constexpr ::std::int32_t print = 0; -constexpr int require_once = 0; +constexpr ::std::int32_t require_once = 0; } @@ -81,19 +81,19 @@ class breakPrx : public ::Ice::Proxy { public: - void _cpp_case(int _cpp_catch, int& _cpp_try, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void _cpp_case(::std::int32_t _cpp_catch, ::std::int32_t& _cpp_try, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future caseAsync(int _cpp_catch, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> caseAsync(::std::int32_t _cpp_catch, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - caseAsync(int _cpp_catch, - ::std::function response, + caseAsync(::std::int32_t _cpp_catch, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -148,19 +148,19 @@ class functionPrx : public ::Ice::Proxy { public: - void _cpp_continue(int declare, int _cpp_default, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void _cpp_continue(::std::int32_t declare, ::std::int32_t _cpp_default, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future continueAsync(int declare, int _cpp_default, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future continueAsync(::std::int32_t declare, ::std::int32_t _cpp_default, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - continueAsync(int declare, int _cpp_default, + continueAsync(::std::int32_t declare, ::std::int32_t _cpp_default, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_continue(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_continue(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -342,19 +342,19 @@ class forPrx : public ::Ice::Proxy { public: - array foreach(const ::std::optional& _cpp_if, const ::std::shared_ptr& global, const ::std::optional& include, const ::std::optional& _cpp_return, const ::std::optional& list, int _cpp_new, int _cpp_static, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + array foreach(const ::std::optional& _cpp_if, const ::std::shared_ptr& global, const ::std::optional& include, const ::std::optional& _cpp_return, const ::std::optional& list, ::std::int32_t _cpp_new, ::std::int32_t _cpp_static, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future foreachAsync(const ::std::optional& _cpp_if, const ::std::shared_ptr& global, const ::std::optional& include, const ::std::optional& _cpp_return, const ::std::optional& list, int _cpp_new, int _cpp_static, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future foreachAsync(const ::std::optional& _cpp_if, const ::std::shared_ptr& global, const ::std::optional& include, const ::std::optional& _cpp_return, const ::std::optional& list, ::std::int32_t _cpp_new, ::std::int32_t _cpp_static, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - foreachAsync(const ::std::optional& _cpp_if, const ::std::shared_ptr& global, const ::std::optional& include, const ::std::optional& _cpp_return, const ::std::optional& list, int _cpp_new, int _cpp_static, + foreachAsync(const ::std::optional& _cpp_if, const ::std::shared_ptr& global, const ::std::optional& include, const ::std::optional& _cpp_return, const ::std::optional& list, ::std::int32_t _cpp_new, ::std::int32_t _cpp_static, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_foreach(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::std::shared_ptr&, const ::std::optional&, const ::std::optional&, const ::std::optional&, int, int, const ::Ice::Context&) const; + void _iceI_foreach(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::std::shared_ptr&, const ::std::optional&, const ::std::optional&, const ::std::optional&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -412,21 +412,21 @@ namespace _cpp_and struct _cpp_xor { - int abstract; - int clone; - int _cpp_private; - int _cpp_protected; - int _cpp_public; - int _cpp_this; - int _cpp_throw; - int use; - int var; + ::std::int32_t abstract; + ::std::int32_t clone; + ::std::int32_t _cpp_private; + ::std::int32_t _cpp_protected; + ::std::int32_t _cpp_public; + ::std::int32_t _cpp_this; + ::std::int32_t _cpp_throw; + ::std::int32_t use; + ::std::int32_t var; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(abstract, clone, _cpp_private, _cpp_protected, _cpp_public, _cpp_this, _cpp_throw, use, var); } @@ -460,7 +460,7 @@ class echo : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - echo(int _cpp_if, int _cpp_else, const ::std::optional<::_cpp_and::diePrx>& elseif, int empty) : + echo(::std::int32_t _cpp_if, ::std::int32_t _cpp_else, const ::std::optional<::_cpp_and::diePrx>& elseif, ::std::int32_t empty) : _cpp_if(_cpp_if), _cpp_else(_cpp_else), elseif(elseif), @@ -472,7 +472,7 @@ class echo : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(_cpp_if, _cpp_else, elseif, empty); } @@ -483,10 +483,10 @@ class echo : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int _cpp_if; - int _cpp_else; + ::std::int32_t _cpp_if; + ::std::int32_t _cpp_else; ::std::optional<::_cpp_and::diePrx> elseif; - int empty; + ::std::int32_t empty; }; /// \cond INTERNAL @@ -511,7 +511,7 @@ class endif : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - endif(int endswitch) : + endif(::std::int32_t endswitch) : endswitch(endswitch) { } @@ -520,7 +520,7 @@ class endif : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(endswitch); } @@ -531,7 +531,7 @@ class endif : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int endswitch; + ::std::int32_t endswitch; }; /// \cond INTERNAL @@ -551,7 +551,7 @@ class endwhile : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - endwhile(int endswitch, int eval, int exit) : + endwhile(::std::int32_t endswitch, ::std::int32_t eval, ::std::int32_t exit) : ::Ice::UserExceptionHelper(endswitch), eval(eval), exit(exit) @@ -562,7 +562,7 @@ class endwhile : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(endswitch, eval, exit); } @@ -573,8 +573,8 @@ class endwhile : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int eval; - int exit; + ::std::int32_t eval; + ::std::int32_t exit; }; } @@ -616,7 +616,7 @@ class _cpp_break : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void _cpp_case(int _cpp_catch, int& _cpp_try, const ::Ice::Current& current) = 0; + virtual void _cpp_case(::std::int32_t _cpp_catch, ::std::int32_t& _cpp_try, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_case(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -660,7 +660,7 @@ class function : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void _cpp_continue(int declare, int _cpp_default, const ::Ice::Current& current) = 0; + virtual void _cpp_continue(::std::int32_t declare, ::std::int32_t _cpp_default, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_continue(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -788,7 +788,7 @@ class _cpp_for : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual array foreach(::std::optional _cpp_if, ::std::shared_ptr<::and::echo> global, ::std::optional include, ::std::optional _cpp_return, ::std::optional list, int _cpp_new, int _cpp_static, const ::Ice::Current& current) = 0; + virtual array foreach(::std::optional _cpp_if, ::std::shared_ptr<::and::echo> global, ::std::optional include, ::std::optional _cpp_return, ::std::optional list, ::std::int32_t _cpp_new, ::std::int32_t _cpp_static, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_foreach(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/php/test/Slice/macros/Test.h b/slice2cpp/php/test/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/php/test/Slice/macros/Test.h +++ b/slice2cpp/php/test/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/php/test/Slice/structure/Test.h b/slice2cpp/php/test/Slice/structure/Test.h index a7106d107e2d..5ce6b18a1d3f 100644 --- a/slice2cpp/php/test/Slice/structure/Test.h +++ b/slice2cpp/php/test/Slice/structure/Test.h @@ -65,10 +65,10 @@ struct S1 struct S2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -82,7 +82,7 @@ struct S2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const + std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, ss, sd, s, cls, prx); } @@ -116,7 +116,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C(int i) : + explicit C(::std::int32_t i) : i(i) { } @@ -125,7 +125,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -136,7 +136,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/python/test/Ice/acm/Test.cpp b/slice2cpp/python/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/python/test/Ice/acm/Test.cpp +++ b/slice2cpp/python/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/python/test/Ice/acm/Test.h b/slice2cpp/python/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/python/test/Ice/acm/Test.h +++ b/slice2cpp/python/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/ami/Test.cpp b/slice2cpp/python/test/Ice/ami/Test.cpp index 015b800e177e..55e2dff05466 100644 --- a/slice2cpp/python/test/Ice/ami/Test.cpp +++ b/slice2cpp/python/test/Ice/ami/Test.cpp @@ -232,30 +232,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -340,30 +340,30 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -373,19 +373,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -396,7 +396,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -444,19 +444,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -467,7 +467,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -744,37 +744,37 @@ Test::TestIntfControllerPrx::ice_staticId() return TestIntfController::ice_staticId(); } -int -Test::Outer::Inner::TestIntfPrx::op(int iceP_i, int& iceP_j, const ::Ice::Context& context) const +::std::int32_t +Test::Outer::Inner::TestIntfPrx::op(::std::int32_t iceP_i, ::std::int32_t& iceP_j, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); iceP_j = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); } ::std::function -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, - ::std::function response, +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); } /// \cond INTERNAL void -Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Outer_Inner_TestIntf_op_name); outAsync->invoke(iceC_Test_Outer_Inner_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -785,7 +785,7 @@ Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal: nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -945,7 +945,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -983,7 +983,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -997,7 +997,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -1029,7 +1029,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -1339,11 +1339,11 @@ Test::Outer::Inner::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int iceP_j; - int ret = this->op(iceP_i, iceP_j, current); + ::std::int32_t iceP_j; + ::std::int32_t ret = this->op(iceP_i, iceP_j, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_j, ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/ami/Test.h b/slice2cpp/python/test/Ice/ami/Test.h index 42600507880c..38fb0651095c 100644 --- a/slice2cpp/python/test/Ice/ami/Test.h +++ b/slice2cpp/python/test/Ice/ami/Test.h @@ -186,18 +186,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -228,33 +228,33 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -272,19 +272,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -510,19 +510,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(int i, int& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> opAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(int i, - ::std::function response, + opAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -705,7 +705,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -720,12 +720,12 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -735,7 +735,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -869,11 +869,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpResult { - int returnValue; - int j; + ::std::int32_t returnValue; + ::std::int32_t j; }; - virtual int op(int i, int& j, const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/asyncio/Test.cpp b/slice2cpp/python/test/Ice/asyncio/Test.cpp index c92d40e57e21..7fcffc4bc9ca 100644 --- a/slice2cpp/python/test/Ice/asyncio/Test.cpp +++ b/slice2cpp/python/test/Ice/asyncio/Test.cpp @@ -68,30 +68,30 @@ const ::std::string iceC_Test_TestIntf_shutdown_name = "shutdown"; } -int +::std::int32_t Test::TestIntfPrx::op(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_op, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_op, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_op, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, context); } ::std::function -Test::TestIntfPrx::opAsync(::std::function response, +Test::TestIntfPrx::opAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_op, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_op, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_op_name); outAsync->invoke(iceC_Test_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -100,31 +100,31 @@ Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsync } /// \endcond -int +::std::int32_t Test::TestIntfPrx::callOpOn(const ::std::optional& iceP_proxy, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_callOpOn, iceP_proxy, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_callOpOn, iceP_proxy, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::callOpOnAsync(const ::std::optional& iceP_proxy, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_callOpOn, iceP_proxy, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_callOpOn, iceP_proxy, context); } ::std::function Test::TestIntfPrx::callOpOnAsync(const ::std::optional& iceP_proxy, - ::std::function response, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_callOpOn, iceP_proxy, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_callOpOn, iceP_proxy, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_callOpOn(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_callOpOn(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::std::optional& iceP_proxy, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_callOpOn_name); outAsync->invoke(iceC_Test_TestIntf_callOpOn_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -289,19 +289,19 @@ Test::TestIntfPrx::_iceI_throwUnhandledException2(const ::std::shared_ptr<::IceI /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -312,7 +312,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -402,7 +402,7 @@ Test::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice::Current& cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->op(current); + ::std::int32_t ret = this->op(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -419,7 +419,7 @@ Test::TestIntf::_iceD_callOpOn(::IceInternal::Incoming& inS, const ::Ice::Curren ::std::optional iceP_proxy; istr->readAll(iceP_proxy); inS.endReadParams(); - int ret = this->callOpOn(::std::move(iceP_proxy), current); + ::std::int32_t ret = this->callOpOn(::std::move(iceP_proxy), current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -481,7 +481,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); diff --git a/slice2cpp/python/test/Ice/asyncio/Test.h b/slice2cpp/python/test/Ice/asyncio/Test.h index 768dec69ada0..fa6ed654e4bb 100644 --- a/slice2cpp/python/test/Ice/asyncio/Test.h +++ b/slice2cpp/python/test/Ice/asyncio/Test.h @@ -48,33 +48,33 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(::std::function response, + opAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - int callOpOn(const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t callOpOn(const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future callOpOnAsync(const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> callOpOnAsync(const ::std::optional& proxy, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function callOpOnAsync(const ::std::optional& proxy, - ::std::function response, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_callOpOn(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::Ice::Context&) const; + void _iceI_callOpOn(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::std::optional&, const ::Ice::Context&) const; /// \endcond void throwUserException1(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -133,19 +133,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_throwUnhandledException2(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -284,12 +284,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual int op(const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int callOpOn(::std::optional proxy, const ::Ice::Current& current) = 0; + virtual ::std::int32_t callOpOn(::std::optional proxy, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_callOpOn(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -314,7 +314,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_throwUnhandledException2(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/blobject/Test.cpp b/slice2cpp/python/test/Ice/blobject/Test.cpp index 3f6359bbf4e5..ee88c927f219 100644 --- a/slice2cpp/python/test/Ice/blobject/Test.cpp +++ b/slice2cpp/python/test/Ice/blobject/Test.cpp @@ -61,19 +61,19 @@ const ::std::string iceC_Test_Hello_shutdown_name = "shutdown"; } void -Test::HelloPrx::sayHello(int iceP_delay, const ::Ice::Context& context) const +Test::HelloPrx::sayHello(::std::int32_t iceP_delay, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HelloPrx::_iceI_sayHello, iceP_delay, context).get(); } ::std::future -Test::HelloPrx::sayHelloAsync(int iceP_delay, const ::Ice::Context& context) const +Test::HelloPrx::sayHelloAsync(::std::int32_t iceP_delay, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HelloPrx::_iceI_sayHello, iceP_delay, context); } ::std::function -Test::HelloPrx::sayHelloAsync(int iceP_delay, +Test::HelloPrx::sayHelloAsync(::std::int32_t iceP_delay, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HelloPrx::sayHelloAsync(int iceP_delay, /// \cond INTERNAL void -Test::HelloPrx::_iceI_sayHello(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_delay, const ::Ice::Context& context) const +Test::HelloPrx::_iceI_sayHello(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hello_sayHello_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -95,31 +95,31 @@ Test::HelloPrx::_iceI_sayHello(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -int -Test::HelloPrx::add(int iceP_s1, int iceP_s2, const ::Ice::Context& context) const +::std::int32_t +Test::HelloPrx::add(::std::int32_t iceP_s1, ::std::int32_t iceP_s2, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HelloPrx::_iceI_add, iceP_s1, iceP_s2, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HelloPrx::_iceI_add, iceP_s1, iceP_s2, context).get(); } -::std::future -Test::HelloPrx::addAsync(int iceP_s1, int iceP_s2, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HelloPrx::addAsync(::std::int32_t iceP_s1, ::std::int32_t iceP_s2, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HelloPrx::_iceI_add, iceP_s1, iceP_s2, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HelloPrx::_iceI_add, iceP_s1, iceP_s2, context); } ::std::function -Test::HelloPrx::addAsync(int iceP_s1, int iceP_s2, - ::std::function response, +Test::HelloPrx::addAsync(::std::int32_t iceP_s1, ::std::int32_t iceP_s2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HelloPrx::_iceI_add, iceP_s1, iceP_s2, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HelloPrx::_iceI_add, iceP_s1, iceP_s2, context); } /// \cond INTERNAL void -Test::HelloPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_s1, int iceP_s2, const ::Ice::Context& context) const +Test::HelloPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_s1, ::std::int32_t iceP_s2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hello_add_name); outAsync->invoke(iceC_Test_Hello_add_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -255,7 +255,7 @@ Test::Hello::_iceD_sayHello(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_delay; + ::std::int32_t iceP_delay; istr->readAll(iceP_delay); inS.endReadParams(); this->sayHello(iceP_delay, current); @@ -270,11 +270,11 @@ Test::Hello::_iceD_add(::IceInternal::Incoming& inS, const ::Ice::Current& curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_s1; - int iceP_s2; + ::std::int32_t iceP_s1; + ::std::int32_t iceP_s2; istr->readAll(iceP_s1, iceP_s2); inS.endReadParams(); - int ret = this->add(iceP_s1, iceP_s2, current); + ::std::int32_t ret = this->add(iceP_s1, iceP_s2, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/blobject/Test.h b/slice2cpp/python/test/Ice/blobject/Test.h index 942e6d69ab13..a433c2792ec9 100644 --- a/slice2cpp/python/test/Ice/blobject/Test.h +++ b/slice2cpp/python/test/Ice/blobject/Test.h @@ -48,34 +48,34 @@ class HelloPrx : public ::Ice::Proxy { public: - void sayHello(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sayHello(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sayHelloAsync(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sayHelloAsync(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sayHelloAsync(int delay, + sayHelloAsync(::std::int32_t delay, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sayHello(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sayHello(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int add(int s1, int s2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t add(::std::int32_t s1, ::std::int32_t s2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addAsync(int s1, int s2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addAsync(::std::int32_t s1, ::std::int32_t s2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addAsync(int s1, int s2, - ::std::function response, + addAsync(::std::int32_t s1, ::std::int32_t s2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void raiseUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -228,12 +228,12 @@ class Hello : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sayHello(int delay, const ::Ice::Current& current) = 0; + virtual void sayHello(::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sayHello(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int add(int s1, int s2, const ::Ice::Current& current) = 0; + virtual ::std::int32_t add(::std::int32_t s1, ::std::int32_t s2, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_add(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/custom/Test.h b/slice2cpp/python/test/Ice/custom/Test.h index fd23f02a95bb..e985ffb62f60 100644 --- a/slice2cpp/python/test/Ice/custom/Test.h +++ b/slice2cpp/python/test/Ice/custom/Test.h @@ -45,9 +45,9 @@ namespace Test /** * By default, sequence is received as a string. */ -using ByteString = ::std::vector<::Ice::Byte>; +using ByteString = ::std::vector<::std::uint8_t>; -using ByteList = ::std::vector<::Ice::Byte>; +using ByteList = ::std::vector<::std::uint8_t>; /** * By default, a sequence is received as a list. @@ -60,21 +60,21 @@ using BoolSeq1 = ::std::vector; using BoolSeq2 = ::std::vector; -using ByteSeq1 = ::std::vector<::Ice::Byte>; +using ByteSeq1 = ::std::vector<::std::uint8_t>; -using ByteSeq2 = ::std::vector<::Ice::Byte>; +using ByteSeq2 = ::std::vector<::std::uint8_t>; -using ShortSeq1 = ::std::vector; +using ShortSeq1 = ::std::vector<::std::int16_t>; -using ShortSeq2 = ::std::vector; +using ShortSeq2 = ::std::vector<::std::int16_t>; -using IntSeq1 = ::std::vector; +using IntSeq1 = ::std::vector<::std::int32_t>; -using IntSeq2 = ::std::vector; +using IntSeq2 = ::std::vector<::std::int32_t>; -using LongSeq1 = ::std::vector; +using LongSeq1 = ::std::vector<::std::int64_t>; -using LongSeq2 = ::std::vector; +using LongSeq2 = ::std::vector<::std::int64_t>; using FloatSeq1 = ::std::vector; diff --git a/slice2cpp/python/test/Ice/custom/TestNumPy.h b/slice2cpp/python/test/Ice/custom/TestNumPy.h index b28b73f7b520..8c483e7c271a 100644 --- a/slice2cpp/python/test/Ice/custom/TestNumPy.h +++ b/slice2cpp/python/test/Ice/custom/TestNumPy.h @@ -53,21 +53,21 @@ using BoolSeq1 = ::std::vector; using BoolSeq2 = ::std::vector; -using ByteSeq1 = ::std::vector<::Ice::Byte>; +using ByteSeq1 = ::std::vector<::std::uint8_t>; -using ByteSeq2 = ::std::vector<::Ice::Byte>; +using ByteSeq2 = ::std::vector<::std::uint8_t>; -using ShortSeq1 = ::std::vector; +using ShortSeq1 = ::std::vector<::std::int16_t>; -using ShortSeq2 = ::std::vector; +using ShortSeq2 = ::std::vector<::std::int16_t>; -using IntSeq1 = ::std::vector; +using IntSeq1 = ::std::vector<::std::int32_t>; -using IntSeq2 = ::std::vector; +using IntSeq2 = ::std::vector<::std::int32_t>; -using LongSeq1 = ::std::vector; +using LongSeq1 = ::std::vector<::std::int64_t>; -using LongSeq2 = ::std::vector; +using LongSeq2 = ::std::vector<::std::int64_t>; using FloatSeq1 = ::std::vector; @@ -77,7 +77,7 @@ using DoubleSeq1 = ::std::vector; using DoubleSeq2 = ::std::vector; -using Complex128Seq = ::std::vector<::Ice::Byte>; +using Complex128Seq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/python/test/Ice/defaultValue/Test.h b/slice2cpp/python/test/Ice/defaultValue/Test.h index 2c7025da3408..2727577c4bf6 100644 --- a/slice2cpp/python/test/Ice/defaultValue/Test.h +++ b/slice2cpp/python/test/Ice/defaultValue/Test.h @@ -70,13 +70,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -96,9 +96,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -108,11 +108,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -123,10 +123,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -137,8 +137,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -148,7 +148,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -157,10 +157,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -170,8 +170,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -181,7 +181,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -189,13 +189,13 @@ struct Struct2 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -204,10 +204,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -221,7 +221,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, iseq, dict, st); } @@ -255,7 +255,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -279,7 +279,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -292,16 +292,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -328,7 +328,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -343,7 +343,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -465,7 +465,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -489,7 +489,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -502,16 +502,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -535,7 +535,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -550,7 +550,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/python/test/Ice/dispatcher/Test.cpp b/slice2cpp/python/test/Ice/dispatcher/Test.cpp index 5cbc3cb5e5f5..77ed4d8ca345 100644 --- a/slice2cpp/python/test/Ice/dispatcher/Test.cpp +++ b/slice2cpp/python/test/Ice/dispatcher/Test.cpp @@ -107,19 +107,19 @@ Test::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsync /// \endcond void -Test::TestIntfPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_to, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -130,7 +130,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -324,7 +324,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); diff --git a/slice2cpp/python/test/Ice/dispatcher/Test.h b/slice2cpp/python/test/Ice/dispatcher/Test.h index eb5f2107e53f..2582f57cb89a 100644 --- a/slice2cpp/python/test/Ice/dispatcher/Test.h +++ b/slice2cpp/python/test/Ice/dispatcher/Test.h @@ -67,19 +67,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opWithPayload(const ::Ice::ByteSeq& seq, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -283,7 +283,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/enums/Test.h b/slice2cpp/python/test/Ice/enums/Test.h index 2a0b5da8f18d..83abf5f1e817 100644 --- a/slice2cpp/python/test/Ice/enums/Test.h +++ b/slice2cpp/python/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/python/test/Ice/exceptions/Test.cpp b/slice2cpp/python/test/Ice/exceptions/Test.cpp index 4b39dda3cc9a..c4d3aa9b7ce1 100644 --- a/slice2cpp/python/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/python/test/Ice/exceptions/Test.cpp @@ -234,19 +234,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -257,7 +257,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -283,19 +283,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -306,7 +306,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -336,19 +336,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -359,7 +359,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -385,19 +385,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -408,7 +408,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -434,19 +434,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -457,7 +457,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -483,19 +483,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -506,7 +506,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -532,19 +532,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -555,7 +555,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -581,19 +581,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -604,7 +604,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -630,19 +630,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -653,7 +653,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -665,19 +665,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -688,7 +688,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -700,19 +700,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -723,7 +723,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -970,36 +970,36 @@ Test::ThrowerPrx::_iceI_throwAfterException(const ::std::shared_ptr<::IceInterna } /// \endcond -int -Test::ThrowerPrx::throwMarshalException(int& iceP_p, const ::Ice::Context& context) const +::std::int32_t +Test::ThrowerPrx::throwMarshalException(::std::int32_t& iceP_p, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &ThrowerPrx::_iceI_throwMarshalException, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &ThrowerPrx::_iceI_throwMarshalException, context).get(); iceP_p = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> Test::ThrowerPrx::throwMarshalExceptionAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &ThrowerPrx::_iceI_throwMarshalException, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &ThrowerPrx::_iceI_throwMarshalException, context); } ::std::function -Test::ThrowerPrx::throwMarshalExceptionAsync(::std::function response, +Test::ThrowerPrx::throwMarshalExceptionAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::ThrowerPrx::_iceI_throwMarshalException, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::ThrowerPrx::_iceI_throwMarshalException, context); } /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwMarshalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwMarshalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwMarshalException_name); outAsync->invoke(iceC_Test_Thrower_throwMarshalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1007,7 +1007,7 @@ Test::ThrowerPrx::_iceI_throwMarshalException(const ::std::shared_ptr<::IceInter nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1208,7 +1208,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1223,7 +1223,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1238,8 +1238,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1254,9 +1254,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1271,8 +1271,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1287,9 +1287,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1304,9 +1304,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1321,8 +1321,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); this->throwModA(iceP_a, iceP_a2, current); @@ -1337,7 +1337,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1352,8 +1352,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1368,9 +1368,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); @@ -1474,8 +1474,8 @@ Test::Thrower::_iceD_throwMarshalException(::IceInternal::Incoming& inS, const : { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int iceP_p; - int ret = this->throwMarshalException(iceP_p, current); + ::std::int32_t iceP_p; + ::std::int32_t ret = this->throwMarshalException(iceP_p, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p, ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/exceptions/Test.h b/slice2cpp/python/test/Ice/exceptions/Test.h index 898e31561989..370fb0bfd31e 100644 --- a/slice2cpp/python/test/Ice/exceptions/Test.h +++ b/slice2cpp/python/test/Ice/exceptions/Test.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -426,18 +426,18 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_throwAfterException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int throwMarshalException(int& p, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t throwMarshalException(::std::int32_t& p, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> throwMarshalExceptionAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> throwMarshalExceptionAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwMarshalExceptionAsync(::std::function response, + throwMarshalExceptionAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwMarshalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; + void _iceI_throwMarshalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, const ::Ice::Context&) const; /// \endcond /** @@ -572,7 +572,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -581,7 +581,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -592,7 +592,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -612,7 +612,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -622,7 +622,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -633,7 +633,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -649,7 +649,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -659,7 +659,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -670,7 +670,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -686,7 +686,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -695,7 +695,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -706,7 +706,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; namespace Mod @@ -725,7 +725,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -735,7 +735,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -746,7 +746,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -840,57 +840,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModA(int a, int a2, const ::Ice::Current& current) = 0; + virtual void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -935,11 +935,11 @@ class Thrower : public virtual ::Ice::Object */ struct ThrowMarshalExceptionResult { - int returnValue; - int p; + ::std::int32_t returnValue; + ::std::int32_t p; }; - virtual int throwMarshalException(int& p, const ::Ice::Current& current) = 0; + virtual ::std::int32_t throwMarshalException(::std::int32_t& p, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwMarshalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/faultTolerance/Test.cpp b/slice2cpp/python/test/Ice/faultTolerance/Test.cpp index 8c29b5e9015d..88d4a9960180 100644 --- a/slice2cpp/python/test/Ice/faultTolerance/Test.cpp +++ b/slice2cpp/python/test/Ice/faultTolerance/Test.cpp @@ -151,30 +151,30 @@ Test::TestIntfPrx::_iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int +::std::int32_t Test::TestIntfPrx::pid(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_pid, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_pid, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::pidAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_pid, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_pid, context); } ::std::function -Test::TestIntfPrx::pidAsync(::std::function response, +Test::TestIntfPrx::pidAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_pid, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_pid_name); outAsync->invoke(iceC_Test_TestIntf_pid_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -256,7 +256,7 @@ Test::TestIntf::_iceD_pid(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->pid(current); + ::std::int32_t ret = this->pid(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/faultTolerance/Test.h b/slice2cpp/python/test/Ice/faultTolerance/Test.h index 252456e2c21b..e1626ef6e479 100644 --- a/slice2cpp/python/test/Ice/faultTolerance/Test.h +++ b/slice2cpp/python/test/Ice/faultTolerance/Test.h @@ -90,18 +90,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_idempotentAbort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t pid(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> pidAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - pidAsync(::std::function response, + pidAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_pid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -206,7 +206,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_idempotentAbort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int pid(const ::Ice::Current& current) = 0; + virtual ::std::int32_t pid(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_pid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/location/Test.cpp b/slice2cpp/python/test/Ice/location/Test.cpp index 38e4725febdb..19b040f9bad7 100644 --- a/slice2cpp/python/test/Ice/location/Test.cpp +++ b/slice2cpp/python/test/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/location/Test.h b/slice2cpp/python/test/Ice/location/Test.h index 391ebb95092d..d80dfdf46a3a 100644 --- a/slice2cpp/python/test/Ice/location/Test.h +++ b/slice2cpp/python/test/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/python/test/Ice/objects/ClientPrivate.h b/slice2cpp/python/test/Ice/objects/ClientPrivate.h index fb85d1c9a951..f5e08a7c610f 100644 --- a/slice2cpp/python/test/Ice/objects/ClientPrivate.h +++ b/slice2cpp/python/test/Ice/objects/ClientPrivate.h @@ -45,9 +45,9 @@ struct STwoMembers; namespace Test { -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } diff --git a/slice2cpp/python/test/Ice/objects/ServerPrivate.h b/slice2cpp/python/test/Ice/objects/ServerPrivate.h index 59d1fff3d7b6..9daf8a09598d 100644 --- a/slice2cpp/python/test/Ice/objects/ServerPrivate.h +++ b/slice2cpp/python/test/Ice/objects/ServerPrivate.h @@ -45,9 +45,9 @@ struct STwoMembers; namespace Test { -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } diff --git a/slice2cpp/python/test/Ice/objects/Test.h b/slice2cpp/python/test/Ice/objects/Test.h index 905fabe5fff7..fe97a0ecddbc 100644 --- a/slice2cpp/python/test/Ice/objects/Test.h +++ b/slice2cpp/python/test/Ice/objects/Test.h @@ -88,7 +88,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -757,14 +757,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1018,7 +1018,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1028,7 +1028,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1041,7 +1041,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/python/test/Ice/operations/Test.cpp b/slice2cpp/python/test/Ice/operations/Test.cpp index df3c1aad22da..7225c2bbd55d 100644 --- a/slice2cpp/python/test/Ice/operations/Test.cpp +++ b/slice2cpp/python/test/Ice/operations/Test.cpp @@ -464,37 +464,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -505,7 +505,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -560,39 +560,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -603,7 +603,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2561,30 +2561,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2722,31 +2722,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2758,31 +2758,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2794,31 +2794,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2830,31 +2830,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3631,12 +3631,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3669,15 +3669,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4472,7 +4472,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4540,10 +4540,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4557,10 +4557,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4574,10 +4574,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4591,10 +4591,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/operations/Test.h b/slice2cpp/python/test/Ice/operations/Test.h index 4e596201370a..f7188087fbc2 100644 --- a/slice2cpp/python/test/Ice/operations/Test.h +++ b/slice2cpp/python/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -106,11 +106,11 @@ using MyEnumSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -134,15 +134,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -292,19 +292,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -322,19 +322,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -952,18 +952,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1023,64 +1023,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1563,14 +1563,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1710,11 +1710,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1738,13 +1738,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2313,7 +2313,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2338,22 +2338,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/optional/ClientPrivate.cpp b/slice2cpp/python/test/Ice/optional/ClientPrivate.cpp index 1712dac86f2e..fd3fd9fafbd6 100644 --- a/slice2cpp/python/test/Ice/optional/ClientPrivate.cpp +++ b/slice2cpp/python/test/Ice/optional/ClientPrivate.cpp @@ -94,19 +94,19 @@ Test::Initial2Prx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::Ice /// \endcond void -Test::Initial2Prx::opVoid(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoid(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context).get(); } ::std::future -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context); } ::std::function -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, ::std::function response, ::std::function ex, ::std::function sent, @@ -117,7 +117,7 @@ Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::opti /// \cond INTERNAL void -Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Initial2_opVoid_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -194,7 +194,7 @@ Test::Initial2::_iceD_opVoid(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_v; istr->readAll({1, 2}, iceP_a, iceP_v); inS.endReadParams(); diff --git a/slice2cpp/python/test/Ice/optional/ClientPrivate.h b/slice2cpp/python/test/Ice/optional/ClientPrivate.h index 88e8d67bb2ca..9f25253808c6 100644 --- a/slice2cpp/python/test/Ice/optional/ClientPrivate.h +++ b/slice2cpp/python/test/Ice/optional/ClientPrivate.h @@ -65,19 +65,19 @@ class Initial2Prx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const std::optional<::std::shared_ptr<::Ice::Value>>&, const ::Ice::Context&) const; /// \endcond - void opVoid(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opVoid(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, + opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const ::Ice::Context&) const; + void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const ::Ice::Context&) const; /// \endcond /** @@ -149,7 +149,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : + D(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ds(ds), seq(seq), @@ -161,7 +161,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ds, seq, ao); } @@ -225,7 +225,7 @@ class Initial2 : public virtual ::Ice::Object bool _iceD_opClassAndUnknownOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opVoid(std::optional a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; + virtual void opVoid(std::optional<::std::int32_t> a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVoid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/optional/Test.cpp b/slice2cpp/python/test/Ice/optional/Test.cpp index ef1ab3a9dd7a..7bb75a5af6e3 100644 --- a/slice2cpp/python/test/Ice/optional/Test.cpp +++ b/slice2cpp/python/test/Ice/optional/Test.cpp @@ -322,19 +322,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -345,7 +345,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -371,19 +371,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -394,7 +394,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,19 +420,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -443,7 +443,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -468,37 +468,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -509,7 +509,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -564,37 +564,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,44 +605,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -653,44 +653,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -701,7 +701,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1993,37 +1993,37 @@ Test::InitialPrx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceI /// \endcond void -Test::InitialPrx::opRequiredAfterOptional(int iceP_p1, const std::optional& iceP_p2, int iceP_p3, int& iceP_p4, std::optional& iceP_p5, int& iceP_p6, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredAfterOptional(::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, ::std::int32_t iceP_p3, ::std::int32_t& iceP_p4, std::optional<::std::int32_t>& iceP_p5, ::std::int32_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, int>>(true, this, &InitialPrx::_iceI_opRequiredAfterOptional, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>>(true, this, &InitialPrx::_iceI_opRequiredAfterOptional, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<0>(_result); iceP_p5 = ::std::get<1>(_result); iceP_p6 = ::std::get<2>(_result); } -::std::future<::std::tuple, int>> -Test::InitialPrx::opRequiredAfterOptionalAsync(int iceP_p1, const std::optional& iceP_p2, int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>> +Test::InitialPrx::opRequiredAfterOptionalAsync(::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, ::std::int32_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, int>, ::std::promise>(false, this, &InitialPrx::_iceI_opRequiredAfterOptional, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>, ::std::promise>(false, this, &InitialPrx::_iceI_opRequiredAfterOptional, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::InitialPrx::opRequiredAfterOptionalAsync(int iceP_p1, const std::optional& iceP_p2, int iceP_p3, - ::std::function, int)> response, +Test::InitialPrx::opRequiredAfterOptionalAsync(::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, ::std::int32_t iceP_p3, + ::std::function, ::std::int32_t)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, int>&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, int>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opRequiredAfterOptional, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opRequiredAfterOptional, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredAfterOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, int>>>& outAsync, int iceP_p1, const std::optional& iceP_p2, int iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredAfterOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, ::std::int32_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredAfterOptional_name); outAsync->invoke(iceC_Test_Initial_opRequiredAfterOptional_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2035,7 +2035,7 @@ Test::InitialPrx::_iceI_opRequiredAfterOptional(const ::std::shared_ptr<::IceInt nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, int> v; + ::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t> v; istr->readAll(::std::get<0>(v), ::std::get<2>(v)); istr->readAll({2}, ::std::get<1>(v)); return v; @@ -2044,37 +2044,37 @@ Test::InitialPrx::_iceI_opRequiredAfterOptional(const ::std::shared_ptr<::IceInt /// \endcond void -Test::InitialPrx::opOptionalAfterRequired(int iceP_p1, const std::optional& iceP_p2, const std::optional& iceP_p3, int& iceP_p4, std::optional& iceP_p5, std::optional& iceP_p6, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalAfterRequired(::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, const std::optional<::std::int32_t>& iceP_p3, ::std::int32_t& iceP_p4, std::optional<::std::int32_t>& iceP_p5, std::optional<::std::int32_t>& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opOptionalAfterRequired, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opOptionalAfterRequired, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<0>(_result); iceP_p5 = ::std::get<1>(_result); iceP_p6 = ::std::get<2>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opOptionalAfterRequiredAsync(int iceP_p1, const std::optional& iceP_p2, const std::optional& iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>> +Test::InitialPrx::opOptionalAfterRequiredAsync(::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, const std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opOptionalAfterRequired, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opOptionalAfterRequired, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::InitialPrx::opOptionalAfterRequiredAsync(int iceP_p1, const std::optional& iceP_p2, const std::optional& iceP_p3, - ::std::function, std::optional)> response, +Test::InitialPrx::opOptionalAfterRequiredAsync(::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, const std::optional<::std::int32_t>& iceP_p3, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opOptionalAfterRequired, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opOptionalAfterRequired, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalAfterRequired(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, int iceP_p1, const std::optional& iceP_p2, const std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalAfterRequired(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>>>& outAsync, ::std::int32_t iceP_p1, const std::optional<::std::int32_t>& iceP_p2, const std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalAfterRequired_name); outAsync->invoke(iceC_Test_Initial_opOptionalAfterRequired_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2086,7 +2086,7 @@ Test::InitialPrx::_iceI_opOptionalAfterRequired(const ::std::shared_ptr<::IceInt nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>> v; istr->readAll(::std::get<0>(v)); istr->readAll({3, 4}, ::std::get<1>(v), ::std::get<2>(v)); return v; @@ -3105,7 +3105,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3122,7 +3122,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3139,7 +3139,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3156,11 +3156,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3192,11 +3192,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3210,11 +3210,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3228,11 +3228,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); @@ -3730,15 +3730,15 @@ Test::Initial::_iceD_opRequiredAfterOptional(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_p1; - std::optional iceP_p2; - int iceP_p3; + ::std::int32_t iceP_p1; + std::optional<::std::int32_t> iceP_p2; + ::std::int32_t iceP_p3; istr->readAll(iceP_p1, iceP_p3); istr->readAll({1}, iceP_p2); inS.endReadParams(); - int iceP_p4; - std::optional iceP_p5; - int iceP_p6; + ::std::int32_t iceP_p4; + std::optional<::std::int32_t> iceP_p5; + ::std::int32_t iceP_p6; this->opRequiredAfterOptional(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p6); @@ -3754,15 +3754,15 @@ Test::Initial::_iceD_opOptionalAfterRequired(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_p1; - std::optional iceP_p2; - std::optional iceP_p3; + ::std::int32_t iceP_p1; + std::optional<::std::int32_t> iceP_p2; + std::optional<::std::int32_t> iceP_p3; istr->readAll(iceP_p1); istr->readAll({1, 2}, iceP_p2, iceP_p3); inS.endReadParams(); - int iceP_p4; - std::optional iceP_p5; - std::optional iceP_p6; + ::std::int32_t iceP_p4; + std::optional<::std::int32_t> iceP_p5; + std::optional<::std::int32_t> iceP_p6; this->opOptionalAfterRequired(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4); diff --git a/slice2cpp/python/test/Ice/optional/Test.h b/slice2cpp/python/test/Ice/optional/Test.h index 46915d8f1302..2b2aba61b8be 100644 --- a/slice2cpp/python/test/Ice/optional/Test.h +++ b/slice2cpp/python/test/Ice/optional/Test.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,21 +97,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -219,64 +219,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -294,49 +294,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -744,34 +744,34 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const ::Ice::Context&) const; /// \endcond - void opRequiredAfterOptional(int p1, const std::optional& p2, int p3, int& p4, std::optional& p5, int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredAfterOptional(::std::int32_t p1, const std::optional<::std::int32_t>& p2, ::std::int32_t p3, ::std::int32_t& p4, std::optional<::std::int32_t>& p5, ::std::int32_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, int>> opRequiredAfterOptionalAsync(int p1, const std::optional& p2, int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>> opRequiredAfterOptionalAsync(::std::int32_t p1, const std::optional<::std::int32_t>& p2, ::std::int32_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredAfterOptionalAsync(int p1, const std::optional& p2, int p3, - ::std::function, int)> response, + opRequiredAfterOptionalAsync(::std::int32_t p1, const std::optional<::std::int32_t>& p2, ::std::int32_t p3, + ::std::function, ::std::int32_t)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredAfterOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, int>>>&, int, const std::optional&, int, const ::Ice::Context&) const; + void _iceI_opRequiredAfterOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, ::std::int32_t>>>&, ::std::int32_t, const std::optional<::std::int32_t>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void opOptionalAfterRequired(int p1, const std::optional& p2, const std::optional& p3, int& p4, std::optional& p5, std::optional& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalAfterRequired(::std::int32_t p1, const std::optional<::std::int32_t>& p2, const std::optional<::std::int32_t>& p3, ::std::int32_t& p4, std::optional<::std::int32_t>& p5, std::optional<::std::int32_t>& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opOptionalAfterRequiredAsync(int p1, const std::optional& p2, const std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>> opOptionalAfterRequiredAsync(::std::int32_t p1, const std::optional<::std::int32_t>& p2, const std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalAfterRequiredAsync(int p1, const std::optional& p2, const std::optional& p3, - ::std::function, std::optional)> response, + opOptionalAfterRequiredAsync(::std::int32_t p1, const std::optional<::std::int32_t>& p2, const std::optional<::std::int32_t>& p3, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalAfterRequired(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, int, const std::optional&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opOptionalAfterRequired(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, std::optional<::std::int32_t>, std::optional<::std::int32_t>>>>&, ::std::int32_t, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond void sendOptionalClass(bool req, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1074,13 +1074,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1088,13 +1088,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1116,13 +1116,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1156,7 +1156,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1165,7 +1165,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1176,7 +1176,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1199,7 +1199,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1237,7 +1237,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1248,11 +1248,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1296,7 +1296,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1308,7 +1308,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1319,10 +1319,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1341,7 +1341,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1352,7 +1352,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1376,8 +1376,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1402,7 +1402,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1413,7 +1413,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1444,7 +1444,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1454,7 +1454,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1465,7 +1465,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1659,7 +1659,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1668,7 +1668,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1679,7 +1679,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1784,7 +1784,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1796,7 +1796,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1808,7 +1808,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1830,7 +1830,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1843,7 +1843,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1873,7 +1873,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1884,7 +1884,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1996,17 +1996,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2016,11 +2016,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2044,11 +2044,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2058,11 +2058,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2072,11 +2072,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2455,12 +2455,12 @@ class Initial : public virtual ::Ice::Object */ struct OpRequiredAfterOptionalResult { - int p4; - std::optional p5; - int p6; + ::std::int32_t p4; + std::optional<::std::int32_t> p5; + ::std::int32_t p6; }; - virtual void opRequiredAfterOptional(int p1, std::optional p2, int p3, int& p4, std::optional& p5, int& p6, const ::Ice::Current& current) = 0; + virtual void opRequiredAfterOptional(::std::int32_t p1, std::optional<::std::int32_t> p2, ::std::int32_t p3, ::std::int32_t& p4, std::optional<::std::int32_t>& p5, ::std::int32_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredAfterOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2470,12 +2470,12 @@ class Initial : public virtual ::Ice::Object */ struct OpOptionalAfterRequiredResult { - int p4; - std::optional p5; - std::optional p6; + ::std::int32_t p4; + std::optional<::std::int32_t> p5; + std::optional<::std::int32_t> p6; }; - virtual void opOptionalAfterRequired(int p1, std::optional p2, std::optional p3, int& p4, std::optional& p5, std::optional& p6, const ::Ice::Current& current) = 0; + virtual void opOptionalAfterRequired(::std::int32_t p1, std::optional<::std::int32_t> p2, std::optional<::std::int32_t> p3, ::std::int32_t& p4, std::optional<::std::int32_t>& p5, std::optional<::std::int32_t>& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalAfterRequired(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/packagemd/NoPackage.h b/slice2cpp/python/test/Ice/packagemd/NoPackage.h index 116bc4353817..eba6227e5a2b 100644 --- a/slice2cpp/python/test/Ice/packagemd/NoPackage.h +++ b/slice2cpp/python/test/Ice/packagemd/NoPackage.h @@ -58,7 +58,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -67,7 +67,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -78,7 +78,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -101,7 +101,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -111,7 +111,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -122,7 +122,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -143,7 +143,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -152,7 +152,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -163,7 +163,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -183,7 +183,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -193,7 +193,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -204,7 +204,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; /** @@ -223,7 +223,7 @@ class def : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - def(int i) : + def(::std::int32_t i) : i(i) { } @@ -232,7 +232,7 @@ class def : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -243,7 +243,7 @@ class def : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; } diff --git a/slice2cpp/python/test/Ice/packagemd/Package.h b/slice2cpp/python/test/Ice/packagemd/Package.h index 6fa1feed5c72..6a2bca3a7141 100644 --- a/slice2cpp/python/test/Ice/packagemd/Package.h +++ b/slice2cpp/python/test/Ice/packagemd/Package.h @@ -71,7 +71,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -80,7 +80,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -91,7 +91,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -114,7 +114,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -124,7 +124,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -135,7 +135,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -159,7 +159,7 @@ class C1 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C1(int i) : + explicit C1(::std::int32_t i) : i(i) { } @@ -168,7 +168,7 @@ class C1 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -179,7 +179,7 @@ class C1 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class C2 : public ::Ice::ValueHelper @@ -198,7 +198,7 @@ class C2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C2(int i, long long int l) : + C2(::std::int32_t i, ::std::int64_t l) : Ice::ValueHelper(i), l(l) { @@ -208,7 +208,7 @@ class C2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -219,7 +219,7 @@ class C2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -240,7 +240,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -249,7 +249,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -260,7 +260,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL @@ -280,7 +280,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -290,7 +290,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -301,7 +301,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } @@ -322,7 +322,7 @@ class E1 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E1(int i) : + E1(::std::int32_t i) : i(i) { } @@ -331,7 +331,7 @@ class E1 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -342,7 +342,7 @@ class E1 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class E2 : public ::Ice::UserExceptionHelper @@ -358,7 +358,7 @@ class E2 : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - E2(int i, long long int l) : + E2(::std::int32_t i, ::std::int64_t l) : ::Ice::UserExceptionHelper(i), l(l) { @@ -368,7 +368,7 @@ class E2 : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, l); } @@ -379,7 +379,7 @@ class E2 : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - long long int l; + ::std::int64_t l; }; } diff --git a/slice2cpp/python/test/Ice/scope/Test.h b/slice2cpp/python/test/Ice/scope/Test.h index 06b58770c6e3..d4596c711107 100644 --- a/slice2cpp/python/test/Ice/scope/Test.h +++ b/slice2cpp/python/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/python/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/python/test/Ice/slicing/objects/ClientPrivate.h index e09124ade434..3d94a6123b1b 100644 --- a/slice2cpp/python/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/python/test/Ice/slicing/objects/ClientPrivate.h @@ -104,7 +104,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -114,7 +114,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -163,7 +163,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -173,7 +173,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -203,7 +203,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -213,7 +213,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -224,7 +224,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -243,7 +243,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -253,7 +253,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -283,7 +283,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -293,7 +293,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/python/test/Ice/slicing/objects/ServerPrivate.h b/slice2cpp/python/test/Ice/slicing/objects/ServerPrivate.h index ac8f7ad46561..ace8c39a13ee 100644 --- a/slice2cpp/python/test/Ice/slicing/objects/ServerPrivate.h +++ b/slice2cpp/python/test/Ice/slicing/objects/ServerPrivate.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/python/test/Ice/slicing/objects/Test.h b/slice2cpp/python/test/Ice/slicing/objects/Test.h index 83914be23c07..55cff72d32e4 100644 --- a/slice2cpp/python/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/python/test/Ice/slicing/objects/Test.h @@ -55,7 +55,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -952,7 +952,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -961,7 +961,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -972,7 +972,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -991,7 +991,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1001,7 +1001,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1050,7 +1050,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1060,7 +1060,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1090,7 +1090,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1100,7 +1100,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/python/test/Ice/thread/Test.cpp b/slice2cpp/python/test/Ice/thread/Test.cpp index bf7c2638b617..9183fc8d87ec 100644 --- a/slice2cpp/python/test/Ice/thread/Test.cpp +++ b/slice2cpp/python/test/Ice/thread/Test.cpp @@ -91,19 +91,19 @@ const ::std::string iceC_Test_RemoteCommunicatorFactory_shutdown_name = "shutdow } void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -114,7 +114,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -163,30 +163,30 @@ Test::RemoteCommunicatorPrx::_iceI_getObject(const ::std::shared_ptr<::IceIntern } /// \endcond -int +::std::int32_t Test::RemoteCommunicatorPrx::getThreadStartCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &RemoteCommunicatorPrx::_iceI_getThreadStartCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RemoteCommunicatorPrx::_iceI_getThreadStartCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::RemoteCommunicatorPrx::getThreadStartCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RemoteCommunicatorPrx::_iceI_getThreadStartCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_getThreadStartCount, context); } ::std::function -Test::RemoteCommunicatorPrx::getThreadStartCountAsync(::std::function response, +Test::RemoteCommunicatorPrx::getThreadStartCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RemoteCommunicatorPrx::_iceI_getThreadStartCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RemoteCommunicatorPrx::_iceI_getThreadStartCount, context); } /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_getThreadStartCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_getThreadStartCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_getThreadStartCount_name); outAsync->invoke(iceC_Test_RemoteCommunicator_getThreadStartCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -195,30 +195,30 @@ Test::RemoteCommunicatorPrx::_iceI_getThreadStartCount(const ::std::shared_ptr<: } /// \endcond -int +::std::int32_t Test::RemoteCommunicatorPrx::getThreadStopCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &RemoteCommunicatorPrx::_iceI_getThreadStopCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RemoteCommunicatorPrx::_iceI_getThreadStopCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::RemoteCommunicatorPrx::getThreadStopCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RemoteCommunicatorPrx::_iceI_getThreadStopCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_getThreadStopCount, context); } ::std::function -Test::RemoteCommunicatorPrx::getThreadStopCountAsync(::std::function response, +Test::RemoteCommunicatorPrx::getThreadStopCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RemoteCommunicatorPrx::_iceI_getThreadStopCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RemoteCommunicatorPrx::_iceI_getThreadStopCount, context); } /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_getThreadStopCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_getThreadStopCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_getThreadStopCount_name); outAsync->invoke(iceC_Test_RemoteCommunicator_getThreadStopCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -368,7 +368,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -463,7 +463,7 @@ Test::RemoteCommunicator::_iceD_getThreadStartCount(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getThreadStartCount(current); + ::std::int32_t ret = this->getThreadStartCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -477,7 +477,7 @@ Test::RemoteCommunicator::_iceD_getThreadStopCount(::IceInternal::Incoming& inS, { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->getThreadStopCount(current); + ::std::int32_t ret = this->getThreadStopCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/python/test/Ice/thread/Test.h b/slice2cpp/python/test/Ice/thread/Test.h index 283c11e86651..65361cc55f8b 100644 --- a/slice2cpp/python/test/Ice/thread/Test.h +++ b/slice2cpp/python/test/Ice/thread/Test.h @@ -57,19 +57,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -138,32 +138,32 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy>>&, const ::Ice::Context&) const; /// \endcond - int getThreadStartCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getThreadStartCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getThreadStartCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getThreadStartCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getThreadStartCountAsync(::std::function response, + getThreadStartCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getThreadStartCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getThreadStartCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - int getThreadStopCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getThreadStopCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getThreadStopCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getThreadStopCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getThreadStopCountAsync(::std::function response, + getThreadStopCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getThreadStopCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getThreadStopCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void destroy(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -348,7 +348,7 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -397,12 +397,12 @@ class RemoteCommunicator : public virtual ::Ice::Object bool _iceD_getObject(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getThreadStartCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getThreadStartCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getThreadStartCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int getThreadStopCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getThreadStopCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getThreadStopCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Ice/timeout/Test.cpp b/slice2cpp/python/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/python/test/Ice/timeout/Test.cpp +++ b/slice2cpp/python/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/python/test/Ice/timeout/Test.h b/slice2cpp/python/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/python/test/Ice/timeout/Test.h +++ b/slice2cpp/python/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Slice/escape/Clash.h b/slice2cpp/python/test/Slice/escape/Clash.h index 03cfb3ff6ea9..316cf7e416e9 100644 --- a/slice2cpp/python/test/Slice/escape/Clash.h +++ b/slice2cpp/python/test/Slice/escape/Clash.h @@ -275,16 +275,16 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; ::std::string other; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs, other); } @@ -318,7 +318,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, const ::std::string& upCast, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, const ::std::string& upCast, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : s(s), context(context), current(current), @@ -341,7 +341,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const ::std::string&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, upCast, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy); } @@ -354,14 +354,14 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; + ::std::int32_t current; + ::std::int16_t response; ::std::string upCast; - int typeId; - short del; - std::optional cookie; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; @@ -391,7 +391,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr) : + Ex(::std::int16_t istr, ::std::int32_t ostr) : istr(istr), ostr(ostr) { @@ -401,7 +401,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr); } @@ -412,8 +412,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; }; /// \cond INTERNAL diff --git a/slice2cpp/python/test/Slice/escape/Key.cpp b/slice2cpp/python/test/Slice/escape/Key.cpp index 5ce9720e8fc8..a7d1fdca1da9 100644 --- a/slice2cpp/python/test/Slice/escape/Key.cpp +++ b/slice2cpp/python/test/Slice/escape/Key.cpp @@ -106,30 +106,30 @@ const ::std::string iceC_and_print_raise_name = "raise"; } void -_cpp_and::delPrx::elif(int iceP_else, int& iceP_except, const ::Ice::Context& context) const +_cpp_and::delPrx::elif(::std::int32_t iceP_else, ::std::int32_t& iceP_except, const ::Ice::Context& context) const { - iceP_except = _makePromiseOutgoing(true, this, &delPrx::_iceI_elif, iceP_else, context).get(); + iceP_except = _makePromiseOutgoing<::std::int32_t>(true, this, &delPrx::_iceI_elif, iceP_else, context).get(); } -::std::future -_cpp_and::delPrx::elifAsync(int iceP_else, const ::Ice::Context& context) const +::std::future<::std::int32_t> +_cpp_and::delPrx::elifAsync(::std::int32_t iceP_else, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &delPrx::_iceI_elif, iceP_else, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &delPrx::_iceI_elif, iceP_else, context); } ::std::function -_cpp_and::delPrx::elifAsync(int iceP_else, - ::std::function response, +_cpp_and::delPrx::elifAsync(::std::int32_t iceP_else, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &_cpp_and::delPrx::_iceI_elif, iceP_else, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &_cpp_and::delPrx::_iceI_elif, iceP_else, context); } /// \cond INTERNAL void -_cpp_and::delPrx::_iceI_elif(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_else, const ::Ice::Context& context) const +_cpp_and::delPrx::_iceI_elif(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_else, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_and_del_elif_name); outAsync->invoke(iceC_and_del_elif_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -191,19 +191,19 @@ _cpp_and::ifPrx::ice_staticId() } ::_cpp_and::assert -_cpp_and::printPrx::raise(const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, int iceP_global, const ::Ice::Context& context) const +_cpp_and::printPrx::raise(const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, ::std::int32_t iceP_global, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &printPrx::_iceI_raise, iceP_else, iceP_return, iceP_while, iceP_yield, iceP_or, iceP_global, context).get(); } ::std::future<::_cpp_and::assert> -_cpp_and::printPrx::raiseAsync(const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, int iceP_global, const ::Ice::Context& context) const +_cpp_and::printPrx::raiseAsync(const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, ::std::int32_t iceP_global, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &printPrx::_iceI_raise, iceP_else, iceP_return, iceP_while, iceP_yield, iceP_or, iceP_global, context); } ::std::function -_cpp_and::printPrx::raiseAsync(const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, int iceP_global, +_cpp_and::printPrx::raiseAsync(const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, ::std::int32_t iceP_global, ::std::function response, ::std::function ex, ::std::function sent, @@ -214,7 +214,7 @@ _cpp_and::printPrx::raiseAsync(const _cpp_continue& iceP_else, const ::std::shar /// \cond INTERNAL void -_cpp_and::printPrx::_iceI_raise(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, int iceP_global, const ::Ice::Context& context) const +_cpp_and::printPrx::_iceI_raise(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const _cpp_continue& iceP_else, const ::std::shared_ptr<_cpp_for>& iceP_return, const ::std::optional& iceP_while, const ::std::optional& iceP_yield, const ::std::optional& iceP_or, ::std::int32_t iceP_global, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_and_print_raise_name); outAsync->invoke(iceC_and_print_raise_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -310,11 +310,11 @@ _cpp_and::del::_iceD_elif(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_else; + ::std::int32_t iceP_else; istr->readAll(iceP_else); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int iceP_except) + auto responseCB = [inA](::std::int32_t iceP_except) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_except); @@ -551,7 +551,7 @@ _cpp_and::print::_iceD_raise(::IceInternal::Incoming& inS, const ::Ice::Current& ::std::optional iceP_while; ::std::optional iceP_yield; ::std::optional iceP_or; - int iceP_global; + ::std::int32_t iceP_global; istr->readAll(iceP_else, iceP_return, iceP_while, iceP_yield, iceP_or, iceP_global); istr->readPendingValues(); inS.endReadParams(); diff --git a/slice2cpp/python/test/Slice/escape/Key.h b/slice2cpp/python/test/Slice/escape/Key.h index 0ca8970a54ea..45db8548638a 100644 --- a/slice2cpp/python/test/Slice/escape/Key.h +++ b/slice2cpp/python/test/Slice/escape/Key.h @@ -62,7 +62,7 @@ using import = ::std::vector; using in = ::std::map<::std::string, assert>; -constexpr int lambda = 0; +constexpr ::std::int32_t lambda = 0; enum class EnumNone : unsigned char { @@ -78,19 +78,19 @@ class delPrx : public ::Ice::Proxy { public: - void elif(int _cpp_else, int& except, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void elif(::std::int32_t _cpp_else, ::std::int32_t& except, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future elifAsync(int _cpp_else, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> elifAsync(::std::int32_t _cpp_else, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - elifAsync(int _cpp_else, - ::std::function response, + elifAsync(::std::int32_t _cpp_else, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_elif(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_elif(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -272,19 +272,19 @@ class printPrx : public ::Ice::Proxy { public: - assert raise(const _cpp_continue& _cpp_else, const ::std::shared_ptr<_cpp_for>& _cpp_return, const ::std::optional& _cpp_while, const ::std::optional& yield, const ::std::optional& _cpp_or, int global, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + assert raise(const _cpp_continue& _cpp_else, const ::std::shared_ptr<_cpp_for>& _cpp_return, const ::std::optional& _cpp_while, const ::std::optional& yield, const ::std::optional& _cpp_or, ::std::int32_t global, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future raiseAsync(const _cpp_continue& _cpp_else, const ::std::shared_ptr<_cpp_for>& _cpp_return, const ::std::optional& _cpp_while, const ::std::optional& yield, const ::std::optional& _cpp_or, int global, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future raiseAsync(const _cpp_continue& _cpp_else, const ::std::shared_ptr<_cpp_for>& _cpp_return, const ::std::optional& _cpp_while, const ::std::optional& yield, const ::std::optional& _cpp_or, ::std::int32_t global, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - raiseAsync(const _cpp_continue& _cpp_else, const ::std::shared_ptr<_cpp_for>& _cpp_return, const ::std::optional& _cpp_while, const ::std::optional& yield, const ::std::optional& _cpp_or, int global, + raiseAsync(const _cpp_continue& _cpp_else, const ::std::shared_ptr<_cpp_for>& _cpp_return, const ::std::optional& _cpp_while, const ::std::optional& yield, const ::std::optional& _cpp_or, ::std::int32_t global, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_raise(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_continue&, const ::std::shared_ptr<_cpp_for>&, const ::std::optional&, const ::std::optional&, const ::std::optional&, int, const ::Ice::Context&) const; + void _iceI_raise(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const _cpp_continue&, const ::std::shared_ptr<_cpp_for>&, const ::std::optional&, const ::std::optional&, const ::std::optional&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -342,13 +342,13 @@ namespace _cpp_and struct _cpp_continue { - int def; + ::std::int32_t def; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(def); } @@ -382,7 +382,7 @@ class _cpp_for : public ::Ice::ValueHelper<_cpp_for, ::Ice::Value> /** * One-shot constructor to initialize all data members. */ - _cpp_for(int lambda, const ::std::optional<::_cpp_and::execPrx>& from, int global) : + _cpp_for(::std::int32_t lambda, const ::std::optional<::_cpp_and::execPrx>& from, ::std::int32_t global) : lambda(lambda), from(from), global(global) @@ -393,7 +393,7 @@ class _cpp_for : public ::Ice::ValueHelper<_cpp_for, ::Ice::Value> * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(lambda, from, global); } @@ -404,9 +404,9 @@ class _cpp_for : public ::Ice::ValueHelper<_cpp_for, ::Ice::Value> */ static const ::std::string& ice_staticId(); - int lambda; + ::std::int32_t lambda; ::std::optional<::_cpp_and::execPrx> from; - int global; + ::std::int32_t global; }; /// \cond INTERNAL @@ -431,7 +431,7 @@ class is : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - is(int lambda) : + is(::std::int32_t lambda) : lambda(lambda) { } @@ -440,7 +440,7 @@ class is : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(lambda); } @@ -451,7 +451,7 @@ class is : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int lambda; + ::std::int32_t lambda; }; /// \cond INTERNAL @@ -471,7 +471,7 @@ class _cpp_not : public ::Ice::UserExceptionHelper<_cpp_not, is> /** * One-shot constructor to initialize all data members. */ - _cpp_not(int lambda, int _cpp_or, int pass) : + _cpp_not(::std::int32_t lambda, ::std::int32_t _cpp_or, ::std::int32_t pass) : ::Ice::UserExceptionHelper<_cpp_not, is>(lambda), _cpp_or(_cpp_or), pass(pass) @@ -482,7 +482,7 @@ class _cpp_not : public ::Ice::UserExceptionHelper<_cpp_not, is> * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(lambda, _cpp_or, pass); } @@ -493,8 +493,8 @@ class _cpp_not : public ::Ice::UserExceptionHelper<_cpp_not, is> */ static const ::std::string& ice_staticId(); - int _cpp_or; - int pass; + ::std::int32_t _cpp_or; + ::std::int32_t pass; }; } @@ -536,7 +536,7 @@ class del : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void elifAsync(int _cpp_else, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void elifAsync(::std::int32_t _cpp_else, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_elif(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -664,7 +664,7 @@ class print : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual assert raise(_cpp_continue _cpp_else, ::std::shared_ptr<::and::for> _cpp_return, ::std::optional _cpp_while, ::std::optional yield, ::std::optional _cpp_or, int global, const ::Ice::Current& current) = 0; + virtual assert raise(_cpp_continue _cpp_else, ::std::shared_ptr<::and::for> _cpp_return, ::std::optional _cpp_while, ::std::optional yield, ::std::optional _cpp_or, ::std::int32_t global, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_raise(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/python/test/Slice/import/Test1.h b/slice2cpp/python/test/Slice/import/Test1.h index 40f49d99c9c2..3a372842de4f 100644 --- a/slice2cpp/python/test/Slice/import/Test1.h +++ b/slice2cpp/python/test/Slice/import/Test1.h @@ -65,7 +65,7 @@ namespace SubA namespace SubSubA1 { -constexpr int Value1 = 10; +constexpr ::std::int32_t Value1 = 10; } @@ -77,7 +77,7 @@ namespace SubB namespace SubSubB1 { -constexpr int Value1 = 20; +constexpr ::std::int32_t Value1 = 20; } diff --git a/slice2cpp/python/test/Slice/import/Test2.h b/slice2cpp/python/test/Slice/import/Test2.h index 4aa537d949e8..9506efeb212b 100644 --- a/slice2cpp/python/test/Slice/import/Test2.h +++ b/slice2cpp/python/test/Slice/import/Test2.h @@ -71,14 +71,14 @@ namespace SubA namespace SubSubA1 { -constexpr int Value2 = 11; +constexpr ::std::int32_t Value2 = 11; } namespace SubSubA2 { -constexpr int Value1 = 30; +constexpr ::std::int32_t Value1 = 30; } @@ -90,7 +90,7 @@ namespace SubB namespace SubSubB1 { -constexpr int Value2 = 21; +constexpr ::std::int32_t Value2 = 21; } diff --git a/slice2cpp/python/test/Slice/macros/Test.h b/slice2cpp/python/test/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/python/test/Slice/macros/Test.h +++ b/slice2cpp/python/test/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/python/test/Slice/structure/Test.h b/slice2cpp/python/test/Slice/structure/Test.h index bb62767bcb47..98a7a7df663b 100644 --- a/slice2cpp/python/test/Slice/structure/Test.h +++ b/slice2cpp/python/test/Slice/structure/Test.h @@ -40,7 +40,7 @@ struct S3; namespace Test { -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; using StringDict = ::std::map<::std::string, ::std::string>; @@ -66,10 +66,10 @@ struct S1 struct S2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; ::std::string str; ::Test::IntSeq seq; ::Test::S1 s; @@ -78,7 +78,7 @@ struct S2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, by, sh, i, l, str, seq, s); } diff --git a/slice2cpp/ruby/test/Ice/acm/Test.cpp b/slice2cpp/ruby/test/Ice/acm/Test.cpp index e93adf192d23..8075a36afe3b 100644 --- a/slice2cpp/ruby/test/Ice/acm/Test.cpp +++ b/slice2cpp/ruby/test/Ice/acm/Test.cpp @@ -99,19 +99,19 @@ const ::std::string iceC_Test_RemoteCommunicator_shutdown_name = "shutdown"; } void -Test::TestIntfPrx::sleep(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/ruby/test/Ice/acm/Test.h b/slice2cpp/ruby/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/ruby/test/Ice/acm/Test.h +++ b/slice2cpp/ruby/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Ice/defaultValue/Test.h b/slice2cpp/ruby/test/Ice/defaultValue/Test.h index 2656d9ac3d20..6f3201df4584 100644 --- a/slice2cpp/ruby/test/Ice/defaultValue/Test.h +++ b/slice2cpp/ruby/test/Ice/defaultValue/Test.h @@ -70,13 +70,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -96,9 +96,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -108,11 +108,11 @@ constexpr double ConstZeroD = 0; constexpr double ConstZeroDotD = 0; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; } @@ -123,10 +123,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -137,8 +137,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -148,7 +148,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -157,10 +157,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -170,8 +170,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -181,7 +181,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -189,13 +189,13 @@ struct Struct2 struct InnerStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -204,10 +204,10 @@ struct InnerStruct struct StructNoDefaults { bool bo; - ::Ice::Byte b; - short s; - int i; - long long int l; + ::std::uint8_t b; + ::std::int16_t s; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -221,7 +221,7 @@ struct StructNoDefaults * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, b, s, i, l, f, d, str, c1, bs, is, dict, st); } @@ -255,7 +255,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -279,7 +279,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -292,16 +292,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -328,7 +328,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -343,7 +343,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -465,7 +465,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -489,7 +489,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -502,16 +502,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -535,7 +535,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -550,7 +550,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/ruby/test/Ice/enums/Test.h b/slice2cpp/ruby/test/Ice/enums/Test.h index 4faaa217843e..34fd9564a243 100644 --- a/slice2cpp/ruby/test/Ice/enums/Test.h +++ b/slice2cpp/ruby/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/ruby/test/Ice/exceptions/Test.cpp b/slice2cpp/ruby/test/Ice/exceptions/Test.cpp index d2f68cf6de24..9950f5235189 100644 --- a/slice2cpp/ruby/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/ruby/test/Ice/exceptions/Test.cpp @@ -228,19 +228,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -251,7 +251,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -277,19 +277,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -300,7 +300,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -330,19 +330,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -353,7 +353,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -379,19 +379,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -402,7 +402,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -428,19 +428,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -451,7 +451,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -477,19 +477,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -500,7 +500,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -526,19 +526,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -549,7 +549,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -575,19 +575,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -598,7 +598,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -624,19 +624,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -647,7 +647,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -659,19 +659,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -682,7 +682,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -694,19 +694,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -717,7 +717,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1082,7 +1082,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1097,7 +1097,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1112,8 +1112,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1128,9 +1128,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1145,8 +1145,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1161,9 +1161,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1178,9 +1178,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1195,8 +1195,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); this->throwModA(iceP_a, iceP_a2, current); @@ -1211,7 +1211,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1226,8 +1226,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1242,9 +1242,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/ruby/test/Ice/exceptions/Test.h b/slice2cpp/ruby/test/Ice/exceptions/Test.h index 1da9621c42c2..89cb8fd9ec53 100644 --- a/slice2cpp/ruby/test/Ice/exceptions/Test.h +++ b/slice2cpp/ruby/test/Ice/exceptions/Test.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -530,7 +530,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -539,7 +539,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -550,7 +550,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -570,7 +570,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -580,7 +580,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -591,7 +591,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -607,7 +607,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -617,7 +617,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -628,7 +628,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -644,7 +644,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -653,7 +653,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -664,7 +664,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; namespace Mod @@ -683,7 +683,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -693,7 +693,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -704,7 +704,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -798,57 +798,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModA(int a, int a2, const ::Ice::Current& current) = 0; + virtual void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Ice/objects/ClientPrivate.h b/slice2cpp/ruby/test/Ice/objects/ClientPrivate.h index fb85d1c9a951..f5e08a7c610f 100644 --- a/slice2cpp/ruby/test/Ice/objects/ClientPrivate.h +++ b/slice2cpp/ruby/test/Ice/objects/ClientPrivate.h @@ -45,9 +45,9 @@ struct STwoMembers; namespace Test { -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } diff --git a/slice2cpp/ruby/test/Ice/objects/Test.h b/slice2cpp/ruby/test/Ice/objects/Test.h index 38b9d7d0a113..621e485d5857 100644 --- a/slice2cpp/ruby/test/Ice/objects/Test.h +++ b/slice2cpp/ruby/test/Ice/objects/Test.h @@ -74,7 +74,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; using ValueSeq = ::std::vector<::std::shared_ptr<::Ice::Value>>; @@ -677,14 +677,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -938,7 +938,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -948,7 +948,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -961,7 +961,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/ruby/test/Ice/operations/Test.cpp b/slice2cpp/ruby/test/Ice/operations/Test.cpp index f26d3960adbf..a9599570d975 100644 --- a/slice2cpp/ruby/test/Ice/operations/Test.cpp +++ b/slice2cpp/ruby/test/Ice/operations/Test.cpp @@ -456,37 +456,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -497,7 +497,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -552,39 +552,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -595,7 +595,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2553,30 +2553,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2679,31 +2679,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2715,31 +2715,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2751,31 +2751,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2787,31 +2787,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3556,12 +3556,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3594,15 +3594,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4397,7 +4397,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4449,10 +4449,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4466,10 +4466,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4483,10 +4483,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4500,10 +4500,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/ruby/test/Ice/operations/Test.h b/slice2cpp/ruby/test/Ice/operations/Test.h index 58d8248de936..b38cfcbe62c5 100644 --- a/slice2cpp/ruby/test/Ice/operations/Test.h +++ b/slice2cpp/ruby/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -104,11 +104,11 @@ using MyEnumSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -132,15 +132,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -290,19 +290,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -320,19 +320,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -950,18 +950,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1006,64 +1006,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1532,14 +1532,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1679,11 +1679,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1707,13 +1707,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2282,7 +2282,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2302,22 +2302,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Ice/optional/ClientPrivate.cpp b/slice2cpp/ruby/test/Ice/optional/ClientPrivate.cpp index 1712dac86f2e..fd3fd9fafbd6 100644 --- a/slice2cpp/ruby/test/Ice/optional/ClientPrivate.cpp +++ b/slice2cpp/ruby/test/Ice/optional/ClientPrivate.cpp @@ -94,19 +94,19 @@ Test::Initial2Prx::_iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::Ice /// \endcond void -Test::Initial2Prx::opVoid(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoid(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context).get(); } ::std::future -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &Initial2Prx::_iceI_opVoid, iceP_a, iceP_v, context); } ::std::function -Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, +Test::Initial2Prx::opVoidAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, ::std::function response, ::std::function ex, ::std::function sent, @@ -117,7 +117,7 @@ Test::Initial2Prx::opVoidAsync(const std::optional& iceP_a, const std::opti /// \cond INTERNAL void -Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const +Test::Initial2Prx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_v, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Initial2_opVoid_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -194,7 +194,7 @@ Test::Initial2::_iceD_opVoid(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_v; istr->readAll({1, 2}, iceP_a, iceP_v); inS.endReadParams(); diff --git a/slice2cpp/ruby/test/Ice/optional/ClientPrivate.h b/slice2cpp/ruby/test/Ice/optional/ClientPrivate.h index 88e8d67bb2ca..9f25253808c6 100644 --- a/slice2cpp/ruby/test/Ice/optional/ClientPrivate.h +++ b/slice2cpp/ruby/test/Ice/optional/ClientPrivate.h @@ -65,19 +65,19 @@ class Initial2Prx : public ::Ice::Proxy void _iceI_opClassAndUnknownOptional(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const std::optional<::std::shared_ptr<::Ice::Value>>&, const ::Ice::Context&) const; /// \endcond - void opVoid(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opVoid(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opVoidAsync(const std::optional& a, const std::optional<::std::string>& v, + opVoidAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& v, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const ::Ice::Context&) const; + void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const ::Ice::Context&) const; /// \endcond /** @@ -149,7 +149,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : + D(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ds, const std::optional<::Test::StringSeq>& seq, const std::optional<::std::shared_ptr<::Test::A>>& ao) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ds(ds), seq(seq), @@ -161,7 +161,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::Test::StringSeq>&, const std::optional<::std::shared_ptr<::Test::A>>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ds, seq, ao); } @@ -225,7 +225,7 @@ class Initial2 : public virtual ::Ice::Object bool _iceD_opClassAndUnknownOptional(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opVoid(std::optional a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; + virtual void opVoid(std::optional<::std::int32_t> a, std::optional<::std::string> v, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opVoid(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Ice/optional/Test.cpp b/slice2cpp/ruby/test/Ice/optional/Test.cpp index ebc5eba2aedf..021e7f325e2b 100644 --- a/slice2cpp/ruby/test/Ice/optional/Test.cpp +++ b/slice2cpp/ruby/test/Ice/optional/Test.cpp @@ -318,19 +318,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -341,7 +341,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -367,19 +367,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -390,7 +390,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -416,19 +416,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -439,7 +439,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -464,37 +464,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -505,7 +505,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -560,37 +560,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -601,44 +601,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -649,44 +649,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -697,7 +697,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -2999,7 +2999,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3016,7 +3016,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3033,7 +3033,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3050,11 +3050,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3086,11 +3086,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3104,11 +3104,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3122,11 +3122,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); diff --git a/slice2cpp/ruby/test/Ice/optional/Test.h b/slice2cpp/ruby/test/Ice/optional/Test.h index 19617421c833..51f9380f8255 100644 --- a/slice2cpp/ruby/test/Ice/optional/Test.h +++ b/slice2cpp/ruby/test/Ice/optional/Test.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,21 +97,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -219,64 +219,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -294,49 +294,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1044,13 +1044,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1058,13 +1058,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1086,13 +1086,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1126,7 +1126,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1135,7 +1135,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1146,7 +1146,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1169,7 +1169,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1207,7 +1207,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1218,11 +1218,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1266,7 +1266,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1278,7 +1278,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1289,10 +1289,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1311,7 +1311,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1322,7 +1322,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1346,8 +1346,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1372,7 +1372,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1383,7 +1383,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1414,7 +1414,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1424,7 +1424,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1435,7 +1435,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1629,7 +1629,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1638,7 +1638,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1649,7 +1649,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1754,7 +1754,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1766,7 +1766,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1778,7 +1778,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1800,7 +1800,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1813,7 +1813,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1843,7 +1843,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1854,7 +1854,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1966,17 +1966,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1986,11 +1986,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2014,11 +2014,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2028,11 +2028,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2042,11 +2042,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Ice/scope/Test.h b/slice2cpp/ruby/test/Ice/scope/Test.h index 06b58770c6e3..d4596c711107 100644 --- a/slice2cpp/ruby/test/Ice/scope/Test.h +++ b/slice2cpp/ruby/test/Ice/scope/Test.h @@ -865,13 +865,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -912,13 +912,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -929,13 +929,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/ruby/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/ruby/test/Ice/slicing/objects/ClientPrivate.h index e09124ade434..3d94a6123b1b 100644 --- a/slice2cpp/ruby/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/ruby/test/Ice/slicing/objects/ClientPrivate.h @@ -104,7 +104,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -114,7 +114,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -163,7 +163,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -173,7 +173,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -203,7 +203,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -213,7 +213,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -224,7 +224,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -243,7 +243,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -253,7 +253,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -283,7 +283,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -293,7 +293,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/ruby/test/Ice/slicing/objects/Test.h b/slice2cpp/ruby/test/Ice/slicing/objects/Test.h index 83914be23c07..55cff72d32e4 100644 --- a/slice2cpp/ruby/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/ruby/test/Ice/slicing/objects/Test.h @@ -55,7 +55,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -952,7 +952,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -961,7 +961,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -972,7 +972,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -991,7 +991,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1001,7 +1001,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1050,7 +1050,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1060,7 +1060,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1090,7 +1090,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1100,7 +1100,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/ruby/test/Ice/timeout/Test.cpp b/slice2cpp/ruby/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/ruby/test/Ice/timeout/Test.cpp +++ b/slice2cpp/ruby/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/ruby/test/Ice/timeout/Test.h b/slice2cpp/ruby/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/ruby/test/Ice/timeout/Test.h +++ b/slice2cpp/ruby/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Slice/escape/Clash.h b/slice2cpp/ruby/test/Slice/escape/Clash.h index 03cfb3ff6ea9..316cf7e416e9 100644 --- a/slice2cpp/ruby/test/Slice/escape/Clash.h +++ b/slice2cpp/ruby/test/Slice/escape/Clash.h @@ -275,16 +275,16 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; ::std::string other; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs, other); } @@ -318,7 +318,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, const ::std::string& upCast, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, const ::std::string& upCast, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : s(s), context(context), current(current), @@ -341,7 +341,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const ::std::string&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, upCast, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy); } @@ -354,14 +354,14 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; + ::std::int32_t current; + ::std::int16_t response; ::std::string upCast; - int typeId; - short del; - std::optional cookie; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; @@ -391,7 +391,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr) : + Ex(::std::int16_t istr, ::std::int32_t ostr) : istr(istr), ostr(ostr) { @@ -401,7 +401,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr); } @@ -412,8 +412,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; }; /// \cond INTERNAL diff --git a/slice2cpp/ruby/test/Slice/escape/Key.cpp b/slice2cpp/ruby/test/Slice/escape/Key.cpp index 490b0768b525..f4e07e1591c1 100644 --- a/slice2cpp/ruby/test/Slice/escape/Key.cpp +++ b/slice2cpp/ruby/test/Slice/escape/Key.cpp @@ -98,19 +98,19 @@ const ::std::string iceC_BEGIN_extend_for_name = "for"; } void -BEGIN::breakPrx::_cpp_case(int iceP_clone, int iceP_def, const ::Ice::Context& context) const +BEGIN::breakPrx::_cpp_case(::std::int32_t iceP_clone, ::std::int32_t iceP_def, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &breakPrx::_iceI_case, iceP_clone, iceP_def, context).get(); } ::std::future -BEGIN::breakPrx::caseAsync(int iceP_clone, int iceP_def, const ::Ice::Context& context) const +BEGIN::breakPrx::caseAsync(::std::int32_t iceP_clone, ::std::int32_t iceP_def, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &breakPrx::_iceI_case, iceP_clone, iceP_def, context); } ::std::function -BEGIN::breakPrx::caseAsync(int iceP_clone, int iceP_def, +BEGIN::breakPrx::caseAsync(::std::int32_t iceP_clone, ::std::int32_t iceP_def, ::std::function response, ::std::function ex, ::std::function sent, @@ -121,7 +121,7 @@ BEGIN::breakPrx::caseAsync(int iceP_clone, int iceP_def, /// \cond INTERNAL void -BEGIN::breakPrx::_iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_clone, int iceP_def, const ::Ice::Context& context) const +BEGIN::breakPrx::_iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_clone, ::std::int32_t iceP_def, const ::Ice::Context& context) const { outAsync->invoke(iceC_BEGIN_break_case_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -238,19 +238,19 @@ BEGIN::elsifPrx::ice_staticId() } ::BEGIN::END -BEGIN::extendPrx::_cpp_for(const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, int iceP_methods, const ::Ice::Context& context) const +BEGIN::extendPrx::_cpp_for(const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, ::std::int32_t iceP_methods, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &extendPrx::_iceI_for, iceP_freeze, iceP_hash, iceP_if, iceP_inspect, iceP_method, iceP_methods, context).get(); } ::std::future<::BEGIN::END> -BEGIN::extendPrx::forAsync(const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, int iceP_methods, const ::Ice::Context& context) const +BEGIN::extendPrx::forAsync(const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, ::std::int32_t iceP_methods, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &extendPrx::_iceI_for, iceP_freeze, iceP_hash, iceP_if, iceP_inspect, iceP_method, iceP_methods, context); } ::std::function -BEGIN::extendPrx::forAsync(const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, int iceP_methods, +BEGIN::extendPrx::forAsync(const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, ::std::int32_t iceP_methods, ::std::function response, ::std::function ex, ::std::function sent, @@ -261,7 +261,7 @@ BEGIN::extendPrx::forAsync(const ::std::shared_ptr& iceP_freeze, const /// \cond INTERNAL void -BEGIN::extendPrx::_iceI_for(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, int iceP_methods, const ::Ice::Context& context) const +BEGIN::extendPrx::_iceI_for(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::shared_ptr& iceP_freeze, const ::std::optional& iceP_hash, const ::std::optional& iceP_if, const ::std::shared_ptr& iceP_inspect, const ::std::optional& iceP_method, ::std::int32_t iceP_methods, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_BEGIN_extend_for_name); outAsync->invoke(iceC_BEGIN_extend_for_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -357,8 +357,8 @@ BEGIN::_cpp_break::_iceD_case(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_clone; - int iceP_def; + ::std::int32_t iceP_clone; + ::std::int32_t iceP_def; istr->readAll(iceP_clone, iceP_def); inS.endReadParams(); this->_cpp_case(iceP_clone, iceP_def, current); @@ -570,7 +570,7 @@ BEGIN::extend::_iceD_for(::IceInternal::Incoming& inS, const ::Ice::Current& cur ::std::optional iceP_if; ::std::shared_ptr iceP_inspect; ::std::optional iceP_method; - int iceP_methods; + ::std::int32_t iceP_methods; istr->readAll(iceP_freeze, iceP_hash, iceP_if, iceP_inspect, iceP_method, iceP_methods); istr->readPendingValues(); inS.endReadParams(); diff --git a/slice2cpp/ruby/test/Slice/escape/Key.h b/slice2cpp/ruby/test/Slice/escape/Key.h index dfa6c31e7f03..eedc57e07afc 100644 --- a/slice2cpp/ruby/test/Slice/escape/Key.h +++ b/slice2cpp/ruby/test/Slice/escape/Key.h @@ -58,7 +58,7 @@ using rescue = ::std::vector; using ensure = ::std::map<::std::string, END>; -constexpr int redo = 1; +constexpr ::std::int32_t redo = 1; } @@ -69,19 +69,19 @@ class breakPrx : public ::Ice::Proxy { public: - void _cpp_case(int clone, int def, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void _cpp_case(::std::int32_t clone, ::std::int32_t def, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future caseAsync(int clone, int def, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future caseAsync(::std::int32_t clone, ::std::int32_t def, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - caseAsync(int clone, int def, + caseAsync(::std::int32_t clone, ::std::int32_t def, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void to_a(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -239,19 +239,19 @@ class extendPrx : public ::Ice::Proxy { public: - END _cpp_for(const ::std::shared_ptr& freeze, const ::std::optional& hash, const ::std::optional& _cpp_if, const ::std::shared_ptr& inspect, const ::std::optional& method, int methods, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + END _cpp_for(const ::std::shared_ptr& freeze, const ::std::optional& hash, const ::std::optional& _cpp_if, const ::std::shared_ptr& inspect, const ::std::optional& method, ::std::int32_t methods, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future forAsync(const ::std::shared_ptr& freeze, const ::std::optional& hash, const ::std::optional& _cpp_if, const ::std::shared_ptr& inspect, const ::std::optional& method, int methods, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future forAsync(const ::std::shared_ptr& freeze, const ::std::optional& hash, const ::std::optional& _cpp_if, const ::std::shared_ptr& inspect, const ::std::optional& method, ::std::int32_t methods, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - forAsync(const ::std::shared_ptr& freeze, const ::std::optional& hash, const ::std::optional& _cpp_if, const ::std::shared_ptr& inspect, const ::std::optional& method, int methods, + forAsync(const ::std::shared_ptr& freeze, const ::std::optional& hash, const ::std::optional& _cpp_if, const ::std::shared_ptr& inspect, const ::std::optional& method, ::std::int32_t methods, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_for(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const ::std::optional&, const ::std::optional&, const ::std::shared_ptr&, const ::std::optional&, int, const ::Ice::Context&) const; + void _iceI_for(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::shared_ptr&, const ::std::optional&, const ::std::optional&, const ::std::shared_ptr&, const ::std::optional&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -309,13 +309,13 @@ namespace BEGIN struct _cpp_and { - int begin; + ::std::int32_t begin; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(begin); } @@ -349,7 +349,7 @@ class display : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - display(int when, int _cpp_do, const ::std::optional<::BEGIN::breakPrx>& dup, int _cpp_else) : + display(::std::int32_t when, ::std::int32_t _cpp_do, const ::std::optional<::BEGIN::breakPrx>& dup, ::std::int32_t _cpp_else) : when(when), _cpp_do(_cpp_do), dup(dup), @@ -361,7 +361,7 @@ class display : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(when, _cpp_do, dup, _cpp_else); } @@ -372,10 +372,10 @@ class display : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int when; - int _cpp_do; + ::std::int32_t when; + ::std::int32_t _cpp_do; ::std::optional<::BEGIN::breakPrx> dup; - int _cpp_else; + ::std::int32_t _cpp_else; }; /// \cond INTERNAL @@ -400,7 +400,7 @@ class next : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - next(int _cpp_new) : + next(::std::int32_t _cpp_new) : _cpp_new(_cpp_new) { } @@ -409,7 +409,7 @@ class next : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_new); } @@ -420,7 +420,7 @@ class next : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_new; + ::std::int32_t _cpp_new; }; /// \cond INTERNAL @@ -440,7 +440,7 @@ class nil : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - nil(int _cpp_new, int _cpp_not, int _cpp_or) : + nil(::std::int32_t _cpp_new, ::std::int32_t _cpp_not, ::std::int32_t _cpp_or) : ::Ice::UserExceptionHelper(_cpp_new), _cpp_not(_cpp_not), _cpp_or(_cpp_or) @@ -451,7 +451,7 @@ class nil : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_new, _cpp_not, _cpp_or); } @@ -462,8 +462,8 @@ class nil : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_not; - int _cpp_or; + ::std::int32_t _cpp_not; + ::std::int32_t _cpp_or; }; } @@ -505,7 +505,7 @@ class _cpp_break : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void _cpp_case(int clone, int def, const ::Ice::Current& current) = 0; + virtual void _cpp_case(::std::int32_t clone, ::std::int32_t def, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_case(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -603,7 +603,7 @@ class extend : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual END _cpp_for(::std::shared_ptr freeze, ::std::optional hash, ::std::optional _cpp_if, ::std::shared_ptr inspect, ::std::optional method, int methods, const ::Ice::Current& current) = 0; + virtual END _cpp_for(::std::shared_ptr freeze, ::std::optional hash, ::std::optional _cpp_if, ::std::shared_ptr inspect, ::std::optional method, ::std::int32_t methods, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_for(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/ruby/test/Slice/macros/Test.h b/slice2cpp/ruby/test/Slice/macros/Test.h index 83191949eae9..557e63730d2a 100644 --- a/slice2cpp/ruby/test/Slice/macros/Test.h +++ b/slice2cpp/ruby/test/Slice/macros/Test.h @@ -53,7 +53,7 @@ class Default : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Default(int x, int y) : + Default(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -63,7 +63,7 @@ class Default : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -74,8 +74,8 @@ class Default : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x; - int y; + ::std::int32_t x; + ::std::int32_t y; }; /// \cond INTERNAL @@ -98,7 +98,7 @@ class NoDefault : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - NoDefault(int x, int y) : + NoDefault(::std::int32_t x, ::std::int32_t y) : x(x), y(y) { @@ -108,7 +108,7 @@ class NoDefault : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(x, y); } @@ -119,8 +119,8 @@ class NoDefault : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int x = 10; - int y = 10; + ::std::int32_t x = 10; + ::std::int32_t y = 10; }; } diff --git a/slice2cpp/ruby/test/Slice/structure/Test.h b/slice2cpp/ruby/test/Slice/structure/Test.h index a7106d107e2d..5ce6b18a1d3f 100644 --- a/slice2cpp/ruby/test/Slice/structure/Test.h +++ b/slice2cpp/ruby/test/Slice/structure/Test.h @@ -65,10 +65,10 @@ struct S1 struct S2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -82,7 +82,7 @@ struct S2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const + std::tuple&, const ::std::optional<::Ice::ObjectPrx>&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, ss, sd, s, cls, prx); } @@ -116,7 +116,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit C(int i) : + explicit C(::std::int32_t i) : i(i) { } @@ -125,7 +125,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -136,7 +136,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; /// \cond INTERNAL diff --git a/slice2cpp/scripts/Controller.cpp b/slice2cpp/scripts/Controller.cpp index 0cf3fbcb34b7..c9dab4abc364 100644 --- a/slice2cpp/scripts/Controller.cpp +++ b/slice2cpp/scripts/Controller.cpp @@ -511,19 +511,19 @@ Test::Common::ControllerPrx::ice_staticId() } void -Test::Common::ProcessPrx::waitReady(int iceP_timeout, const ::Ice::Context& context) const +Test::Common::ProcessPrx::waitReady(::std::int32_t iceP_timeout, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ProcessPrx::_iceI_waitReady, iceP_timeout, context).get(); } ::std::future -Test::Common::ProcessPrx::waitReadyAsync(int iceP_timeout, const ::Ice::Context& context) const +Test::Common::ProcessPrx::waitReadyAsync(::std::int32_t iceP_timeout, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ProcessPrx::_iceI_waitReady, iceP_timeout, context); } ::std::function -Test::Common::ProcessPrx::waitReadyAsync(int iceP_timeout, +Test::Common::ProcessPrx::waitReadyAsync(::std::int32_t iceP_timeout, ::std::function response, ::std::function ex, ::std::function sent, @@ -534,7 +534,7 @@ Test::Common::ProcessPrx::waitReadyAsync(int iceP_timeout, /// \cond INTERNAL void -Test::Common::ProcessPrx::_iceI_waitReady(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_timeout, const ::Ice::Context& context) const +Test::Common::ProcessPrx::_iceI_waitReady(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_timeout, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Common_Process_waitReady_name); outAsync->invoke(iceC_Test_Common_Process_waitReady_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -559,31 +559,31 @@ Test::Common::ProcessPrx::_iceI_waitReady(const ::std::shared_ptr<::IceInternal: } /// \endcond -int -Test::Common::ProcessPrx::waitSuccess(int iceP_timeout, const ::Ice::Context& context) const +::std::int32_t +Test::Common::ProcessPrx::waitSuccess(::std::int32_t iceP_timeout, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &ProcessPrx::_iceI_waitSuccess, iceP_timeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &ProcessPrx::_iceI_waitSuccess, iceP_timeout, context).get(); } -::std::future -Test::Common::ProcessPrx::waitSuccessAsync(int iceP_timeout, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::Common::ProcessPrx::waitSuccessAsync(::std::int32_t iceP_timeout, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &ProcessPrx::_iceI_waitSuccess, iceP_timeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &ProcessPrx::_iceI_waitSuccess, iceP_timeout, context); } ::std::function -Test::Common::ProcessPrx::waitSuccessAsync(int iceP_timeout, - ::std::function response, +Test::Common::ProcessPrx::waitSuccessAsync(::std::int32_t iceP_timeout, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::Common::ProcessPrx::_iceI_waitSuccess, iceP_timeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::Common::ProcessPrx::_iceI_waitSuccess, iceP_timeout, context); } /// \cond INTERNAL void -Test::Common::ProcessPrx::_iceI_waitSuccess(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_timeout, const ::Ice::Context& context) const +Test::Common::ProcessPrx::_iceI_waitSuccess(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_timeout, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Common_Process_waitSuccess_name); outAsync->invoke(iceC_Test_Common_Process_waitSuccess_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1197,7 +1197,7 @@ Test::Common::Process::_iceD_waitReady(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_timeout; + ::std::int32_t iceP_timeout; istr->readAll(iceP_timeout); inS.endReadParams(); this->waitReady(iceP_timeout, current); @@ -1212,10 +1212,10 @@ Test::Common::Process::_iceD_waitSuccess(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_timeout; + ::std::int32_t iceP_timeout; istr->readAll(iceP_timeout); inS.endReadParams(); - int ret = this->waitSuccess(iceP_timeout, current); + ::std::int32_t ret = this->waitSuccess(iceP_timeout, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/scripts/Controller.h b/slice2cpp/scripts/Controller.h index 78a69563b5e7..9b5fdf565da0 100644 --- a/slice2cpp/scripts/Controller.h +++ b/slice2cpp/scripts/Controller.h @@ -310,34 +310,34 @@ class ProcessPrx : public ::Ice::Proxy { public: - void waitReady(int timeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitReady(::std::int32_t timeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitReadyAsync(int timeout, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitReadyAsync(::std::int32_t timeout, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitReadyAsync(int timeout, + waitReadyAsync(::std::int32_t timeout, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitReady(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitReady(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int waitSuccess(int timeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t waitSuccess(::std::int32_t timeout, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitSuccessAsync(int timeout, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> waitSuccessAsync(::std::int32_t timeout, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitSuccessAsync(int timeout, - ::std::function response, + waitSuccessAsync(::std::int32_t timeout, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitSuccess(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitSuccess(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond ::std::string terminate(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1023,12 +1023,12 @@ class Process : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void waitReady(int timeout, const ::Ice::Current& current) = 0; + virtual void waitReady(::std::int32_t timeout, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitReady(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int waitSuccess(int timeout, const ::Ice::Current& current) = 0; + virtual ::std::int32_t waitSuccess(::std::int32_t timeout, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitSuccess(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/slice/Glacier2/Metrics.h b/slice2cpp/slice/Glacier2/Metrics.h index c2c6e7c8a233..36f932c2f01c 100644 --- a/slice2cpp/slice/Glacier2/Metrics.h +++ b/slice2cpp/slice/Glacier2/Metrics.h @@ -80,7 +80,7 @@ class ICE_CLASS(GLACIER2_API) SessionMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), forwardedClient(forwardedClient), forwardedServer(forwardedServer), @@ -96,7 +96,7 @@ class ICE_CLASS(GLACIER2_API) SessionMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, forwardedClient, forwardedServer, routingTableSize, queuedClient, queuedServer, overriddenClient, overriddenServer); } @@ -110,31 +110,31 @@ class ICE_CLASS(GLACIER2_API) SessionMetrics : public ::Ice::ValueHelper(true, this, &RouterPrx::_iceI_getSessionTimeout, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &RouterPrx::_iceI_getSessionTimeout, context).get(); } -::std::future +::std::future<::std::int64_t> Glacier2::RouterPrx::getSessionTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RouterPrx::_iceI_getSessionTimeout, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &RouterPrx::_iceI_getSessionTimeout, context); } ::std::function -Glacier2::RouterPrx::getSessionTimeoutAsync(::std::function response, +Glacier2::RouterPrx::getSessionTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Glacier2::RouterPrx::_iceI_getSessionTimeout, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Glacier2::RouterPrx::_iceI_getSessionTimeout, context); } /// \cond INTERNAL void -Glacier2::RouterPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Glacier2::RouterPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Glacier2_Router_getSessionTimeout_name); outAsync->invoke(iceC_Glacier2_Router_getSessionTimeout_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -329,30 +329,30 @@ Glacier2::RouterPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceIntern } /// \endcond -int +::std::int32_t Glacier2::RouterPrx::getACMTimeout(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &RouterPrx::_iceI_getACMTimeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RouterPrx::_iceI_getACMTimeout, context).get(); } -::std::future +::std::future<::std::int32_t> Glacier2::RouterPrx::getACMTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RouterPrx::_iceI_getACMTimeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RouterPrx::_iceI_getACMTimeout, context); } ::std::function -Glacier2::RouterPrx::getACMTimeoutAsync(::std::function response, +Glacier2::RouterPrx::getACMTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Glacier2::RouterPrx::_iceI_getACMTimeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Glacier2::RouterPrx::_iceI_getACMTimeout, context); } /// \cond INTERNAL void -Glacier2::RouterPrx::_iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Glacier2::RouterPrx::_iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Glacier2_Router_getACMTimeout_name); outAsync->invoke(iceC_Glacier2_Router_getACMTimeout_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -491,7 +491,7 @@ Glacier2::Router::_iceD_getSessionTimeout(::IceInternal::Incoming& inS, const :: { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - long long int ret = this->getSessionTimeout(current); + ::std::int64_t ret = this->getSessionTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -505,7 +505,7 @@ Glacier2::Router::_iceD_getACMTimeout(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getACMTimeout(current); + ::std::int32_t ret = this->getACMTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/slice/Glacier2/Router.h b/slice2cpp/slice/Glacier2/Router.h index 888fac8a4ce4..8d9bbae82e9a 100644 --- a/slice2cpp/slice/Glacier2/Router.h +++ b/slice2cpp/slice/Glacier2/Router.h @@ -300,14 +300,14 @@ class GLACIER2_API RouterPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The timeout (in seconds). */ - long long int getSessionTimeout(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t getSessionTimeout(const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Get the value of the session timeout. Sessions are destroyed if they see no activity for this period of time. * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getSessionTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> getSessionTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the value of the session timeout. Sessions are destroyed if they see no activity for this period of time. @@ -318,13 +318,13 @@ class GLACIER2_API RouterPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getSessionTimeoutAsync(::std::function response, + getSessionTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -333,7 +333,7 @@ class GLACIER2_API RouterPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The timeout (in seconds). */ - int getACMTimeout(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getACMTimeout(const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Get the value of the ACM timeout. Clients supporting connection heartbeats can enable them instead of @@ -341,7 +341,7 @@ class GLACIER2_API RouterPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getACMTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getACMTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the value of the ACM timeout. Clients supporting connection heartbeats can enable them instead of @@ -353,13 +353,13 @@ class GLACIER2_API RouterPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getACMTimeoutAsync(::std::function response, + getACMTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -588,7 +588,7 @@ class GLACIER2_API Router : public virtual ::Ice::Router * @param current The Current object for the invocation. * @return The timeout (in seconds). */ - virtual long long int getSessionTimeout(const ::Ice::Current& current) const = 0; + virtual ::std::int64_t getSessionTimeout(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getSessionTimeout(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -599,7 +599,7 @@ class GLACIER2_API Router : public virtual ::Ice::Router * @param current The Current object for the invocation. * @return The timeout (in seconds). */ - virtual int getACMTimeout(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getACMTimeout(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getACMTimeout(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/slice/Glacier2/SSLInfo.h b/slice2cpp/slice/Glacier2/SSLInfo.h index 3e295daf3d4c..08230703dbdb 100644 --- a/slice2cpp/slice/Glacier2/SSLInfo.h +++ b/slice2cpp/slice/Glacier2/SSLInfo.h @@ -67,7 +67,7 @@ struct SSLInfo /** * The remote port. */ - int remotePort; + ::std::int32_t remotePort; /** * The router's host. */ @@ -75,7 +75,7 @@ struct SSLInfo /** * The router's port. */ - int localPort; + ::std::int32_t localPort; /** * The negotiated cipher suite. */ @@ -89,7 +89,7 @@ struct SSLInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(remoteHost, remotePort, localHost, localPort, cipher, certs); } diff --git a/slice2cpp/slice/Glacier2/Session.cpp b/slice2cpp/slice/Glacier2/Session.cpp index 23c6e9909ae9..f2e8cc1a8558 100644 --- a/slice2cpp/slice/Glacier2/Session.cpp +++ b/slice2cpp/slice/Glacier2/Session.cpp @@ -497,30 +497,30 @@ Glacier2::SessionControlPrx::_iceI_identities(const ::std::shared_ptr<::IceInter } /// \endcond -int +::std::int32_t Glacier2::SessionControlPrx::getSessionTimeout(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &SessionControlPrx::_iceI_getSessionTimeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &SessionControlPrx::_iceI_getSessionTimeout, context).get(); } -::std::future +::std::future<::std::int32_t> Glacier2::SessionControlPrx::getSessionTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &SessionControlPrx::_iceI_getSessionTimeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &SessionControlPrx::_iceI_getSessionTimeout, context); } ::std::function -Glacier2::SessionControlPrx::getSessionTimeoutAsync(::std::function response, +Glacier2::SessionControlPrx::getSessionTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Glacier2::SessionControlPrx::_iceI_getSessionTimeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Glacier2::SessionControlPrx::_iceI_getSessionTimeout, context); } /// \cond INTERNAL void -Glacier2::SessionControlPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Glacier2::SessionControlPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Glacier2_SessionControl_getSessionTimeout_name); outAsync->invoke(iceC_Glacier2_SessionControl_getSessionTimeout_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -1098,7 +1098,7 @@ Glacier2::SessionControl::_iceD_getSessionTimeout(::IceInternal::Incoming& inS, { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getSessionTimeout(current); + ::std::int32_t ret = this->getSessionTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/slice/Glacier2/Session.h b/slice2cpp/slice/Glacier2/Session.h index 8151abb295e2..853a95b5d635 100644 --- a/slice2cpp/slice/Glacier2/Session.h +++ b/slice2cpp/slice/Glacier2/Session.h @@ -603,14 +603,14 @@ class GLACIER2_API SessionControlPrx : public ::Ice::Proxy getSessionTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getSessionTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the session timeout. @@ -621,13 +621,13 @@ class GLACIER2_API SessionControlPrx : public ::Ice::Proxy - getSessionTimeoutAsync(::std::function response, + getSessionTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -1259,7 +1259,7 @@ class GLACIER2_API SessionControl : public virtual ::Ice::Object * @param current The Current object for the invocation. * @return The timeout. */ - virtual int getSessionTimeout(const ::Ice::Current& current) = 0; + virtual ::std::int32_t getSessionTimeout(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_getSessionTimeout(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/slice/Ice/BuiltinSequences.h b/slice2cpp/slice/Ice/BuiltinSequences.h index 390fe2714d91..00791377da5f 100644 --- a/slice2cpp/slice/Ice/BuiltinSequences.h +++ b/slice2cpp/slice/Ice/BuiltinSequences.h @@ -56,22 +56,22 @@ using BoolSeq = ::std::vector; /** * A sequence of bytes. */ -using ByteSeq = ::std::vector; +using ByteSeq = ::std::vector<::std::uint8_t>; /** * A sequence of shorts. */ -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; /** * A sequence of ints. */ -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; /** * A sequence of longs. */ -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; /** * A sequence of floats. diff --git a/slice2cpp/slice/Ice/EndpointTypes.h b/slice2cpp/slice/Ice/EndpointTypes.h index caa52d04e7a2..2859d06a7ef1 100644 --- a/slice2cpp/slice/Ice/EndpointTypes.h +++ b/slice2cpp/slice/Ice/EndpointTypes.h @@ -48,47 +48,47 @@ namespace Ice /** * Uniquely identifies TCP endpoints. */ -constexpr short TCPEndpointType = 1; +constexpr ::std::int16_t TCPEndpointType = 1; /** * Uniquely identifies SSL endpoints. */ -constexpr short SSLEndpointType = 2; +constexpr ::std::int16_t SSLEndpointType = 2; /** * Uniquely identifies UDP endpoints. */ -constexpr short UDPEndpointType = 3; +constexpr ::std::int16_t UDPEndpointType = 3; /** * Uniquely identifies TCP-based WebSocket endpoints. */ -constexpr short WSEndpointType = 4; +constexpr ::std::int16_t WSEndpointType = 4; /** * Uniquely identifies SSL-based WebSocket endpoints. */ -constexpr short WSSEndpointType = 5; +constexpr ::std::int16_t WSSEndpointType = 5; /** * Uniquely identifies Bluetooth endpoints. */ -constexpr short BTEndpointType = 6; +constexpr ::std::int16_t BTEndpointType = 6; /** * Uniquely identifies SSL Bluetooth endpoints. */ -constexpr short BTSEndpointType = 7; +constexpr ::std::int16_t BTSEndpointType = 7; /** * Uniquely identifies iAP-based endpoints. */ -constexpr short iAPEndpointType = 8; +constexpr ::std::int16_t iAPEndpointType = 8; /** * Uniquely identifies SSL iAP-based endpoints. */ -constexpr short iAPSEndpointType = 9; +constexpr ::std::int16_t iAPSEndpointType = 9; } diff --git a/slice2cpp/slice/Ice/Metrics.cpp b/slice2cpp/slice/Ice/Metrics.cpp index 0dc273d8e83d..20e241788120 100644 --- a/slice2cpp/slice/Ice/Metrics.cpp +++ b/slice2cpp/slice/Ice/Metrics.cpp @@ -226,36 +226,36 @@ IceMX::MetricsAdminPrx::_iceI_disableMetricsView(const ::std::shared_ptr<::IceIn /// \endcond ::IceMX::MetricsView -IceMX::MetricsAdminPrx::getMetricsView(const ::std::string& iceP_view, long long int& iceP_timestamp, const ::Ice::Context& context) const +IceMX::MetricsAdminPrx::getMetricsView(const ::std::string& iceP_view, ::std::int64_t& iceP_timestamp, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MetricsAdminPrx::_iceI_getMetricsView, iceP_view, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MetricsAdminPrx::_iceI_getMetricsView, iceP_view, context).get(); iceP_timestamp = ::std::get<1>(_result); return ::std::move(::std::get<0>(_result)); } -::std::future<::std::tuple<::IceMX::MetricsView, long long int>> +::std::future<::std::tuple<::IceMX::MetricsView, ::std::int64_t>> IceMX::MetricsAdminPrx::getMetricsViewAsync(const ::std::string& iceP_view, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MetricsAdminPrx::_iceI_getMetricsView, iceP_view, context); + return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MetricsAdminPrx::_iceI_getMetricsView, iceP_view, context); } ::std::function IceMX::MetricsAdminPrx::getMetricsViewAsync(const ::std::string& iceP_view, - ::std::function response, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple&& _result) { response(::std::move(::std::get<0>(_result)), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsView, iceP_view, context); + return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsView, iceP_view, context); } /// \cond INTERNAL void -IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::std::string& iceP_view, const ::Ice::Context& context) const +IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::std::string& iceP_view, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceMX_MetricsAdmin_getMetricsView_name); outAsync->invoke(iceC_IceMX_MetricsAdmin_getMetricsView_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::SlicedFormat, context, @@ -279,7 +279,7 @@ IceMX::MetricsAdminPrx::_iceI_getMetricsView(const ::std::shared_ptr<::IceIntern }, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); istr->readPendingValues(); return v; @@ -573,7 +573,7 @@ IceMX::MetricsAdmin::_iceD_getMetricsView(::IceInternal::Incoming& inS, const :: istr->readAll(iceP_view); inS.endReadParams(); inS.setFormat(::Ice::FormatType::SlicedFormat); - long long int iceP_timestamp; + ::std::int64_t iceP_timestamp; MetricsView ret = this->getMetricsView(::std::move(iceP_view), iceP_timestamp, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_timestamp, ret); diff --git a/slice2cpp/slice/Ice/Metrics.h b/slice2cpp/slice/Ice/Metrics.h index fbdfe0c2bcd0..c225ded5977e 100644 --- a/slice2cpp/slice/Ice/Metrics.h +++ b/slice2cpp/slice/Ice/Metrics.h @@ -62,7 +62,7 @@ namespace IceMX /** * A dictionary of strings to integers. */ -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; /** * A sequence of {@link MetricsFailures}. @@ -209,7 +209,7 @@ class ICE_API MetricsAdminPrx : public ::Ice::Proxy> getMetricsViewAsync(const ::std::string& view, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> getMetricsViewAsync(const ::std::string& view, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the metrics objects for the given metrics view. This returns a dictionary of metric maps for each metrics @@ -234,13 +234,13 @@ class ICE_API MetricsAdminPrx : public ::Ice::Proxy getMetricsViewAsync(const ::std::string& view, - ::std::function response, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::string&, const ::Ice::Context&) const; + void _iceI_getMetricsView(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -441,7 +441,7 @@ class ICE_CLASS(ICE_API) Metrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures); } @@ -473,20 +473,20 @@ class ICE_CLASS(ICE_API) Metrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), inUseForIO(inUseForIO), inUseForUser(inUseForUser), @@ -533,7 +533,7 @@ class ICE_CLASS(ICE_API) ThreadMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, inUseForIO, inUseForUser, inUseForOther); } @@ -547,16 +547,16 @@ class ICE_CLASS(ICE_API) ThreadMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), userException(userException), size(size), @@ -599,7 +599,7 @@ class ICE_CLASS(ICE_API) DispatchMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, userException, size, replySize); } @@ -613,15 +613,15 @@ class ICE_CLASS(ICE_API) DispatchMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), size(size), replySize(replySize) @@ -664,7 +664,7 @@ class ICE_CLASS(ICE_API) ChildInvocationMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, size, replySize); } @@ -678,11 +678,11 @@ class ICE_CLASS(ICE_API) ChildInvocationMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures, size, replySize) { } @@ -722,7 +722,7 @@ class ICE_CLASS(ICE_API) CollocatedMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, size, replySize); } @@ -762,7 +762,7 @@ class ICE_CLASS(ICE_API) RemoteMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures, size, replySize) { } @@ -771,7 +771,7 @@ class ICE_CLASS(ICE_API) RemoteMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, size, replySize); } @@ -812,7 +812,7 @@ class ICE_CLASS(ICE_API) InvocationMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), retry(retry), userException(userException), @@ -825,7 +825,7 @@ class ICE_CLASS(ICE_API) InvocationMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, retry, userException, remotes, collocated); } @@ -839,11 +839,11 @@ class ICE_CLASS(ICE_API) InvocationMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), receivedBytes(receivedBytes), sentBytes(sentBytes) @@ -894,7 +894,7 @@ class ICE_CLASS(ICE_API) ConnectionMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, receivedBytes, sentBytes); } @@ -908,11 +908,11 @@ class ICE_CLASS(ICE_API) ConnectionMetrics : public ::Ice::ValueHelper(true, this, &ProcessPrx::_iceI_writeMessage, iceP_message, iceP_fd, context).get(); } ::std::future -Ice::ProcessPrx::writeMessageAsync(const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context) const +Ice::ProcessPrx::writeMessageAsync(const ::std::string& iceP_message, ::std::int32_t iceP_fd, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ProcessPrx::_iceI_writeMessage, iceP_message, iceP_fd, context); } ::std::function -Ice::ProcessPrx::writeMessageAsync(const ::std::string& iceP_message, int iceP_fd, +Ice::ProcessPrx::writeMessageAsync(const ::std::string& iceP_message, ::std::int32_t iceP_fd, ::std::function response, ::std::function ex, ::std::function sent, @@ -112,7 +112,7 @@ Ice::ProcessPrx::writeMessageAsync(const ::std::string& iceP_message, int iceP_f /// \cond INTERNAL void -Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_message, int iceP_fd, const Context& context) const +Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_message, ::std::int32_t iceP_fd, const Context& context) const { outAsync->invoke(iceC_Ice_Process_writeMessage_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](OutputStream* ostr) @@ -173,7 +173,7 @@ Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& cu _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_message; - int iceP_fd; + ::std::int32_t iceP_fd; istr->readAll(iceP_message, iceP_fd); inS.endReadParams(); this->writeMessage(::std::move(iceP_message), iceP_fd, current); diff --git a/slice2cpp/slice/Ice/Process.h b/slice2cpp/slice/Ice/Process.h index fbb132aa286b..43dacd5c51e9 100644 --- a/slice2cpp/slice/Ice/Process.h +++ b/slice2cpp/slice/Ice/Process.h @@ -104,7 +104,7 @@ class ICE_API ProcessPrx : public Proxy * @param fd 1 for stdout, 2 for stderr. * @param context The Context map to send with the invocation. */ - void writeMessage(const ::std::string& message, int fd, const Context& context = noExplicitContext) const; + void writeMessage(const ::std::string& message, ::std::int32_t fd, const Context& context = noExplicitContext) const; /** * Write a message on the process' stdout or stderr. @@ -113,7 +113,7 @@ class ICE_API ProcessPrx : public Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future writeMessageAsync(const ::std::string& message, int fd, const Context& context = noExplicitContext)const; + ::std::future writeMessageAsync(const ::std::string& message, ::std::int32_t fd, const Context& context = noExplicitContext)const; /** * Write a message on the process' stdout or stderr. @@ -126,14 +126,14 @@ class ICE_API ProcessPrx : public Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - writeMessageAsync(const ::std::string& message, int fd, + writeMessageAsync(const ::std::string& message, ::std::int32_t fd, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const Context& context = noExplicitContext) const; /// \cond INTERNAL - void _iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, int, const Context&) const; + void _iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, ::std::int32_t, const Context&) const; /// \endcond /** @@ -245,7 +245,7 @@ class ICE_API Process : public virtual Object * @param fd 1 for stdout, 2 for stderr. * @param current The Current object for the invocation. */ - virtual void writeMessage(::std::string message, int fd, const Current& current) = 0; + virtual void writeMessage(::std::string message, ::std::int32_t fd, const Current& current) = 0; /// \cond INTERNAL bool _iceD_writeMessage(::IceInternal::Incoming&, const Current&); /// \endcond diff --git a/slice2cpp/slice/Ice/RemoteLogger.cpp b/slice2cpp/slice/Ice/RemoteLogger.cpp index 2a7b9878b25e..07685cfad7ea 100644 --- a/slice2cpp/slice/Ice/RemoteLogger.cpp +++ b/slice2cpp/slice/Ice/RemoteLogger.cpp @@ -155,19 +155,19 @@ Ice::RemoteLoggerPrx::ice_staticId() } void -Ice::LoggerAdminPrx::attachRemoteLogger(const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context) const +Ice::LoggerAdminPrx::attachRemoteLogger(const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &LoggerAdminPrx::_iceI_attachRemoteLogger, iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context).get(); } ::std::future -Ice::LoggerAdminPrx::attachRemoteLoggerAsync(const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context) const +Ice::LoggerAdminPrx::attachRemoteLoggerAsync(const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &LoggerAdminPrx::_iceI_attachRemoteLogger, iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context); } ::std::function -Ice::LoggerAdminPrx::attachRemoteLoggerAsync(const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, +Ice::LoggerAdminPrx::attachRemoteLoggerAsync(const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, ::std::function response, ::std::function ex, ::std::function sent, @@ -178,7 +178,7 @@ Ice::LoggerAdminPrx::attachRemoteLoggerAsync(const ::std::optional>& outAsync, const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const Context& context) const +Ice::LoggerAdminPrx::_iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, const Context& context) const { _checkTwowayOnly(iceC_Ice_LoggerAdmin_attachRemoteLogger_name); outAsync->invoke(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -240,7 +240,7 @@ Ice::LoggerAdminPrx::_iceI_detachRemoteLogger(const ::std::shared_ptr<::IceInter /// \endcond ::Ice::LogMessageSeq -Ice::LoggerAdminPrx::getLog(const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, ::std::string& iceP_prefix, const ::Ice::Context& context) const +Ice::LoggerAdminPrx::getLog(const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, ::std::string& iceP_prefix, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &LoggerAdminPrx::_iceI_getLog, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context).get(); iceP_prefix = ::std::move(::std::get<1>(_result)); @@ -248,13 +248,13 @@ Ice::LoggerAdminPrx::getLog(const LogMessageTypeSeq& iceP_messageTypes, const St } ::std::future<::std::tuple<::Ice::LogMessageSeq, ::std::string>> -Ice::LoggerAdminPrx::getLogAsync(const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context) const +Ice::LoggerAdminPrx::getLogAsync(const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &LoggerAdminPrx::_iceI_getLog, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, context); } ::std::function -Ice::LoggerAdminPrx::getLogAsync(const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, +Ice::LoggerAdminPrx::getLogAsync(const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, ::std::function response, ::std::function ex, ::std::function sent, @@ -269,7 +269,7 @@ Ice::LoggerAdminPrx::getLogAsync(const LogMessageTypeSeq& iceP_messageTypes, con /// \cond INTERNAL void -Ice::LoggerAdminPrx::_iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const Context& context) const +Ice::LoggerAdminPrx::_iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, ::std::int32_t iceP_messageMax, const Context& context) const { _checkTwowayOnly(iceC_Ice_LoggerAdmin_getLog_name); outAsync->invoke(iceC_Ice_LoggerAdmin_getLog_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -439,7 +439,7 @@ Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const C ::std::optional iceP_prx; LogMessageTypeSeq iceP_messageTypes; StringSeq iceP_traceCategories; - int iceP_messageMax; + ::std::int32_t iceP_messageMax; istr->readAll(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax); inS.endReadParams(); this->attachRemoteLogger(::std::move(iceP_prx), ::std::move(iceP_messageTypes), ::std::move(iceP_traceCategories), iceP_messageMax, current); @@ -473,7 +473,7 @@ Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const Current& curr auto istr = inS.startReadParams(); LogMessageTypeSeq iceP_messageTypes; StringSeq iceP_traceCategories; - int iceP_messageMax; + ::std::int32_t iceP_messageMax; istr->readAll(iceP_messageTypes, iceP_traceCategories, iceP_messageMax); inS.endReadParams(); ::std::string iceP_prefix; diff --git a/slice2cpp/slice/Ice/RemoteLogger.h b/slice2cpp/slice/Ice/RemoteLogger.h index a43fc64b2bc4..4d25afc934c2 100644 --- a/slice2cpp/slice/Ice/RemoteLogger.h +++ b/slice2cpp/slice/Ice/RemoteLogger.h @@ -246,7 +246,7 @@ class ICE_API LoggerAdminPrx : public Proxy * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already attached to this admin * object. */ - void attachRemoteLogger(const ::std::optional& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, const Context& context = noExplicitContext) const; + void attachRemoteLogger(const ::std::optional& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, ::std::int32_t messageMax, const Context& context = noExplicitContext) const; /** * Attaches a RemoteLogger object to the local logger. attachRemoteLogger calls init on the provided @@ -262,7 +262,7 @@ class ICE_API LoggerAdminPrx : public Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future attachRemoteLoggerAsync(const ::std::optional& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, const Context& context = noExplicitContext)const; + ::std::future attachRemoteLoggerAsync(const ::std::optional& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, ::std::int32_t messageMax, const Context& context = noExplicitContext)const; /** * Attaches a RemoteLogger object to the local logger. attachRemoteLogger calls init on the provided @@ -282,14 +282,14 @@ class ICE_API LoggerAdminPrx : public Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - attachRemoteLoggerAsync(const ::std::optional& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, + attachRemoteLoggerAsync(const ::std::optional& prx, const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, ::std::int32_t messageMax, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const Context& context = noExplicitContext) const; /// \cond INTERNAL - void _iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const LogMessageTypeSeq&, const StringSeq&, int, const Context&) const; + void _iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const LogMessageTypeSeq&, const StringSeq&, ::std::int32_t, const Context&) const; /// \endcond /** @@ -341,7 +341,7 @@ class ICE_API LoggerAdminPrx : public Proxy * @param context The Context map to send with the invocation. * @return The Log messages. */ - LogMessageSeq getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, ::std::string& prefix, const Context& context = noExplicitContext) const; + LogMessageSeq getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, ::std::int32_t messageMax, ::std::string& prefix, const Context& context = noExplicitContext) const; /** * Retrieves log messages recently logged. @@ -355,7 +355,7 @@ class ICE_API LoggerAdminPrx : public Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future<::std::tuple> getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, const Context& context = noExplicitContext)const; + ::std::future<::std::tuple> getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, ::std::int32_t messageMax, const Context& context = noExplicitContext)const; /** * Retrieves log messages recently logged. @@ -373,14 +373,14 @@ class ICE_API LoggerAdminPrx : public Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax, + getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, ::std::int32_t messageMax, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const Context& context = noExplicitContext) const; /// \cond INTERNAL - void _iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const LogMessageTypeSeq&, const StringSeq&, int, const Context&) const; + void _iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const LogMessageTypeSeq&, const StringSeq&, ::std::int32_t, const Context&) const; /// \endcond /** @@ -450,7 +450,7 @@ struct LogMessage * The date and time when the {@link Logger} received this message, expressed as the number of microseconds * since the Unix Epoch (00:00:00 UTC on 1 January 1970) */ - long long int timestamp; + ::std::int64_t timestamp; /** * For a message of type trace, the trace category of this log message; otherwise, the empty string. */ @@ -464,7 +464,7 @@ struct LogMessage * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(type, timestamp, traceCategory, message); } @@ -638,7 +638,7 @@ class ICE_API LoggerAdmin : public virtual Object * @throws Ice::RemoteLoggerAlreadyAttachedException Raised if this remote logger is already attached to this admin * object. */ - virtual void attachRemoteLogger(::std::optional prx, LogMessageTypeSeq messageTypes, StringSeq traceCategories, int messageMax, const Current& current) = 0; + virtual void attachRemoteLogger(::std::optional prx, LogMessageTypeSeq messageTypes, StringSeq traceCategories, ::std::int32_t messageMax, const Current& current) = 0; /// \cond INTERNAL bool _iceD_attachRemoteLogger(::IceInternal::Incoming&, const Current&); /// \endcond @@ -678,7 +678,7 @@ class ICE_API LoggerAdmin : public virtual Object * @param current The Current object for the invocation. * @return The Log messages. */ - virtual LogMessageSeq getLog(LogMessageTypeSeq messageTypes, StringSeq traceCategories, int messageMax, ::std::string& prefix, const Current& current) = 0; + virtual LogMessageSeq getLog(LogMessageTypeSeq messageTypes, StringSeq traceCategories, ::std::int32_t messageMax, ::std::string& prefix, const Current& current) = 0; /// \cond INTERNAL bool _iceD_getLog(::IceInternal::Incoming&, const Current&); /// \endcond diff --git a/slice2cpp/slice/Ice/Version.h b/slice2cpp/slice/Ice/Version.h index cb3939c9c90d..b0b5f9b7fc11 100644 --- a/slice2cpp/slice/Ice/Version.h +++ b/slice2cpp/slice/Ice/Version.h @@ -60,14 +60,14 @@ namespace Ice */ struct ProtocolVersion { - ::Ice::Byte major; - ::Ice::Byte minor; + ::std::uint8_t major; + ::std::uint8_t minor; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(major, minor); } @@ -79,14 +79,14 @@ struct ProtocolVersion */ struct EncodingVersion { - ::Ice::Byte major; - ::Ice::Byte minor; + ::std::uint8_t major; + ::std::uint8_t minor; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(major, minor); } diff --git a/slice2cpp/slice/IceGrid/Admin.cpp b/slice2cpp/slice/IceGrid/Admin.cpp index 82cb9e2d72f7..c221a8a76fd1 100644 --- a/slice2cpp/slice/IceGrid/Admin.cpp +++ b/slice2cpp/slice/IceGrid/Admin.cpp @@ -1020,31 +1020,31 @@ IceGrid::AdminPrx::_iceI_getServerState(const ::std::shared_ptr<::IceInternal::O } /// \endcond -int +::std::int32_t IceGrid::AdminPrx::getServerPid(const ::std::string& iceP_id, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &AdminPrx::_iceI_getServerPid, iceP_id, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &AdminPrx::_iceI_getServerPid, iceP_id, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::AdminPrx::getServerPidAsync(const ::std::string& iceP_id, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &AdminPrx::_iceI_getServerPid, iceP_id, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &AdminPrx::_iceI_getServerPid, iceP_id, context); } ::std::function IceGrid::AdminPrx::getServerPidAsync(const ::std::string& iceP_id, - ::std::function response, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::AdminPrx::_iceI_getServerPid, iceP_id, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::AdminPrx::_iceI_getServerPid, iceP_id, context); } /// \cond INTERNAL void -IceGrid::AdminPrx::_iceI_getServerPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_id, const ::Ice::Context& context) const +IceGrid::AdminPrx::_iceI_getServerPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::std::string& iceP_id, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Admin_getServerPid_name); outAsync->invoke(iceC_IceGrid_Admin_getServerPid_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -2231,31 +2231,31 @@ IceGrid::AdminPrx::_iceI_getNodeAdmin(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t IceGrid::AdminPrx::getNodeProcessorSocketCount(const ::std::string& iceP_name, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &AdminPrx::_iceI_getNodeProcessorSocketCount, iceP_name, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &AdminPrx::_iceI_getNodeProcessorSocketCount, iceP_name, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::AdminPrx::getNodeProcessorSocketCountAsync(const ::std::string& iceP_name, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &AdminPrx::_iceI_getNodeProcessorSocketCount, iceP_name, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &AdminPrx::_iceI_getNodeProcessorSocketCount, iceP_name, context); } ::std::function IceGrid::AdminPrx::getNodeProcessorSocketCountAsync(const ::std::string& iceP_name, - ::std::function response, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::AdminPrx::_iceI_getNodeProcessorSocketCount, iceP_name, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::AdminPrx::_iceI_getNodeProcessorSocketCount, iceP_name, context); } /// \cond INTERNAL void -IceGrid::AdminPrx::_iceI_getNodeProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::string& iceP_name, const ::Ice::Context& context) const +IceGrid::AdminPrx::_iceI_getNodeProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::std::string& iceP_name, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Admin_getNodeProcessorSocketCount_name); outAsync->invoke(iceC_IceGrid_Admin_getNodeProcessorSocketCount_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -2696,7 +2696,7 @@ IceGrid::AdminPrx::ice_staticId() } bool -IceGrid::FileIteratorPrx::read(int iceP_size, ::Ice::StringSeq& iceP_lines, const ::Ice::Context& context) const +IceGrid::FileIteratorPrx::read(::std::int32_t iceP_size, ::Ice::StringSeq& iceP_lines, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &FileIteratorPrx::_iceI_read, iceP_size, context).get(); iceP_lines = ::std::move(::std::get<1>(_result)); @@ -2704,13 +2704,13 @@ IceGrid::FileIteratorPrx::read(int iceP_size, ::Ice::StringSeq& iceP_lines, cons } ::std::future<::std::tuple> -IceGrid::FileIteratorPrx::readAsync(int iceP_size, const ::Ice::Context& context) const +IceGrid::FileIteratorPrx::readAsync(::std::int32_t iceP_size, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &FileIteratorPrx::_iceI_read, iceP_size, context); } ::std::function -IceGrid::FileIteratorPrx::readAsync(int iceP_size, +IceGrid::FileIteratorPrx::readAsync(::std::int32_t iceP_size, ::std::function response, ::std::function ex, ::std::function sent, @@ -2725,7 +2725,7 @@ IceGrid::FileIteratorPrx::readAsync(int iceP_size, /// \cond INTERNAL void -IceGrid::FileIteratorPrx::_iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_size, const ::Ice::Context& context) const +IceGrid::FileIteratorPrx::_iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, ::std::int32_t iceP_size, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_FileIterator_read_name); outAsync->invoke(iceC_IceGrid_FileIterator_read_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3086,19 +3086,19 @@ IceGrid::NodeObserverPrx::ice_staticId() } void -IceGrid::ApplicationObserverPrx::applicationInit(int iceP_serial, const ApplicationInfoSeq& iceP_applications, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationInit(::std::int32_t iceP_serial, const ApplicationInfoSeq& iceP_applications, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ApplicationObserverPrx::_iceI_applicationInit, iceP_serial, iceP_applications, context).get(); } ::std::future -IceGrid::ApplicationObserverPrx::applicationInitAsync(int iceP_serial, const ApplicationInfoSeq& iceP_applications, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationInitAsync(::std::int32_t iceP_serial, const ApplicationInfoSeq& iceP_applications, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ApplicationObserverPrx::_iceI_applicationInit, iceP_serial, iceP_applications, context); } ::std::function -IceGrid::ApplicationObserverPrx::applicationInitAsync(int iceP_serial, const ApplicationInfoSeq& iceP_applications, +IceGrid::ApplicationObserverPrx::applicationInitAsync(::std::int32_t iceP_serial, const ApplicationInfoSeq& iceP_applications, ::std::function response, ::std::function ex, ::std::function sent, @@ -3109,7 +3109,7 @@ IceGrid::ApplicationObserverPrx::applicationInitAsync(int iceP_serial, const App /// \cond INTERNAL void -IceGrid::ApplicationObserverPrx::_iceI_applicationInit(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_serial, const ApplicationInfoSeq& iceP_applications, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::_iceI_applicationInit(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_serial, const ApplicationInfoSeq& iceP_applications, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_ApplicationObserver_applicationInit_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -3122,19 +3122,19 @@ IceGrid::ApplicationObserverPrx::_iceI_applicationInit(const ::std::shared_ptr<: /// \endcond void -IceGrid::ApplicationObserverPrx::applicationAdded(int iceP_serial, const ApplicationInfo& iceP_desc, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationAdded(::std::int32_t iceP_serial, const ApplicationInfo& iceP_desc, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ApplicationObserverPrx::_iceI_applicationAdded, iceP_serial, iceP_desc, context).get(); } ::std::future -IceGrid::ApplicationObserverPrx::applicationAddedAsync(int iceP_serial, const ApplicationInfo& iceP_desc, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationAddedAsync(::std::int32_t iceP_serial, const ApplicationInfo& iceP_desc, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ApplicationObserverPrx::_iceI_applicationAdded, iceP_serial, iceP_desc, context); } ::std::function -IceGrid::ApplicationObserverPrx::applicationAddedAsync(int iceP_serial, const ApplicationInfo& iceP_desc, +IceGrid::ApplicationObserverPrx::applicationAddedAsync(::std::int32_t iceP_serial, const ApplicationInfo& iceP_desc, ::std::function response, ::std::function ex, ::std::function sent, @@ -3145,7 +3145,7 @@ IceGrid::ApplicationObserverPrx::applicationAddedAsync(int iceP_serial, const Ap /// \cond INTERNAL void -IceGrid::ApplicationObserverPrx::_iceI_applicationAdded(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_serial, const ApplicationInfo& iceP_desc, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::_iceI_applicationAdded(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_serial, const ApplicationInfo& iceP_desc, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_ApplicationObserver_applicationAdded_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -3158,19 +3158,19 @@ IceGrid::ApplicationObserverPrx::_iceI_applicationAdded(const ::std::shared_ptr< /// \endcond void -IceGrid::ApplicationObserverPrx::applicationRemoved(int iceP_serial, const ::std::string& iceP_name, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationRemoved(::std::int32_t iceP_serial, const ::std::string& iceP_name, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ApplicationObserverPrx::_iceI_applicationRemoved, iceP_serial, iceP_name, context).get(); } ::std::future -IceGrid::ApplicationObserverPrx::applicationRemovedAsync(int iceP_serial, const ::std::string& iceP_name, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationRemovedAsync(::std::int32_t iceP_serial, const ::std::string& iceP_name, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ApplicationObserverPrx::_iceI_applicationRemoved, iceP_serial, iceP_name, context); } ::std::function -IceGrid::ApplicationObserverPrx::applicationRemovedAsync(int iceP_serial, const ::std::string& iceP_name, +IceGrid::ApplicationObserverPrx::applicationRemovedAsync(::std::int32_t iceP_serial, const ::std::string& iceP_name, ::std::function response, ::std::function ex, ::std::function sent, @@ -3181,7 +3181,7 @@ IceGrid::ApplicationObserverPrx::applicationRemovedAsync(int iceP_serial, const /// \cond INTERNAL void -IceGrid::ApplicationObserverPrx::_iceI_applicationRemoved(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_serial, const ::std::string& iceP_name, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::_iceI_applicationRemoved(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_serial, const ::std::string& iceP_name, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_ApplicationObserver_applicationRemoved_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -3193,19 +3193,19 @@ IceGrid::ApplicationObserverPrx::_iceI_applicationRemoved(const ::std::shared_pt /// \endcond void -IceGrid::ApplicationObserverPrx::applicationUpdated(int iceP_serial, const ApplicationUpdateInfo& iceP_desc, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationUpdated(::std::int32_t iceP_serial, const ApplicationUpdateInfo& iceP_desc, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ApplicationObserverPrx::_iceI_applicationUpdated, iceP_serial, iceP_desc, context).get(); } ::std::future -IceGrid::ApplicationObserverPrx::applicationUpdatedAsync(int iceP_serial, const ApplicationUpdateInfo& iceP_desc, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::applicationUpdatedAsync(::std::int32_t iceP_serial, const ApplicationUpdateInfo& iceP_desc, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ApplicationObserverPrx::_iceI_applicationUpdated, iceP_serial, iceP_desc, context); } ::std::function -IceGrid::ApplicationObserverPrx::applicationUpdatedAsync(int iceP_serial, const ApplicationUpdateInfo& iceP_desc, +IceGrid::ApplicationObserverPrx::applicationUpdatedAsync(::std::int32_t iceP_serial, const ApplicationUpdateInfo& iceP_desc, ::std::function response, ::std::function ex, ::std::function sent, @@ -3216,7 +3216,7 @@ IceGrid::ApplicationObserverPrx::applicationUpdatedAsync(int iceP_serial, const /// \cond INTERNAL void -IceGrid::ApplicationObserverPrx::_iceI_applicationUpdated(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_serial, const ApplicationUpdateInfo& iceP_desc, const ::Ice::Context& context) const +IceGrid::ApplicationObserverPrx::_iceI_applicationUpdated(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_serial, const ApplicationUpdateInfo& iceP_desc, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_ApplicationObserver_applicationUpdated_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -3719,30 +3719,30 @@ IceGrid::AdminSessionPrx::_iceI_setObserversByIdentity(const ::std::shared_ptr<: } /// \endcond -int +::std::int32_t IceGrid::AdminSessionPrx::startUpdate(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &AdminSessionPrx::_iceI_startUpdate, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &AdminSessionPrx::_iceI_startUpdate, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::AdminSessionPrx::startUpdateAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &AdminSessionPrx::_iceI_startUpdate, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &AdminSessionPrx::_iceI_startUpdate, context); } ::std::function -IceGrid::AdminSessionPrx::startUpdateAsync(::std::function response, +IceGrid::AdminSessionPrx::startUpdateAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::AdminSessionPrx::_iceI_startUpdate, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::AdminSessionPrx::_iceI_startUpdate, context); } /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_startUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_startUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_startUpdate_name); outAsync->invoke(iceC_IceGrid_AdminSession_startUpdate_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3842,19 +3842,19 @@ IceGrid::AdminSessionPrx::_iceI_getReplicaName(const ::std::shared_ptr<::IceInte /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openServerLog(const ::std::string& iceP_id, const ::std::string& iceP_path, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openServerLog(const ::std::string& iceP_id, const ::std::string& iceP_path, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openServerLog, iceP_id, iceP_path, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openServerLogAsync(const ::std::string& iceP_id, const ::std::string& iceP_path, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openServerLogAsync(const ::std::string& iceP_id, const ::std::string& iceP_path, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openServerLog, iceP_id, iceP_path, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openServerLogAsync(const ::std::string& iceP_id, const ::std::string& iceP_path, int iceP_count, +IceGrid::AdminSessionPrx::openServerLogAsync(const ::std::string& iceP_id, const ::std::string& iceP_path, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -3865,7 +3865,7 @@ IceGrid::AdminSessionPrx::openServerLogAsync(const ::std::string& iceP_id, const /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_id, const ::std::string& iceP_path, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_id, const ::std::string& iceP_path, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openServerLog_name); outAsync->invoke(iceC_IceGrid_AdminSession_openServerLog_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3903,19 +3903,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openServerStdErr(const ::std::string& iceP_id, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openServerStdErr(const ::std::string& iceP_id, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openServerStdErr, iceP_id, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openServerStdErrAsync(const ::std::string& iceP_id, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openServerStdErrAsync(const ::std::string& iceP_id, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openServerStdErr, iceP_id, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openServerStdErrAsync(const ::std::string& iceP_id, int iceP_count, +IceGrid::AdminSessionPrx::openServerStdErrAsync(const ::std::string& iceP_id, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -3926,7 +3926,7 @@ IceGrid::AdminSessionPrx::openServerStdErrAsync(const ::std::string& iceP_id, in /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_id, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_id, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openServerStdErr_name); outAsync->invoke(iceC_IceGrid_AdminSession_openServerStdErr_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3964,19 +3964,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openServerStdOut(const ::std::string& iceP_id, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openServerStdOut(const ::std::string& iceP_id, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openServerStdOut, iceP_id, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openServerStdOutAsync(const ::std::string& iceP_id, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openServerStdOutAsync(const ::std::string& iceP_id, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openServerStdOut, iceP_id, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openServerStdOutAsync(const ::std::string& iceP_id, int iceP_count, +IceGrid::AdminSessionPrx::openServerStdOutAsync(const ::std::string& iceP_id, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -3987,7 +3987,7 @@ IceGrid::AdminSessionPrx::openServerStdOutAsync(const ::std::string& iceP_id, in /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_id, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_id, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openServerStdOut_name); outAsync->invoke(iceC_IceGrid_AdminSession_openServerStdOut_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -4025,19 +4025,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openNodeStdErr(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openNodeStdErr(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openNodeStdErr, iceP_name, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openNodeStdErrAsync(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openNodeStdErrAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openNodeStdErr, iceP_name, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openNodeStdErrAsync(const ::std::string& iceP_name, int iceP_count, +IceGrid::AdminSessionPrx::openNodeStdErrAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -4048,7 +4048,7 @@ IceGrid::AdminSessionPrx::openNodeStdErrAsync(const ::std::string& iceP_name, in /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openNodeStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openNodeStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openNodeStdErr_name); outAsync->invoke(iceC_IceGrid_AdminSession_openNodeStdErr_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -4082,19 +4082,19 @@ IceGrid::AdminSessionPrx::_iceI_openNodeStdErr(const ::std::shared_ptr<::IceInte /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openNodeStdOut(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openNodeStdOut(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openNodeStdOut, iceP_name, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openNodeStdOutAsync(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openNodeStdOutAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openNodeStdOut, iceP_name, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openNodeStdOutAsync(const ::std::string& iceP_name, int iceP_count, +IceGrid::AdminSessionPrx::openNodeStdOutAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -4105,7 +4105,7 @@ IceGrid::AdminSessionPrx::openNodeStdOutAsync(const ::std::string& iceP_name, in /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openNodeStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openNodeStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openNodeStdOut_name); outAsync->invoke(iceC_IceGrid_AdminSession_openNodeStdOut_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -4139,19 +4139,19 @@ IceGrid::AdminSessionPrx::_iceI_openNodeStdOut(const ::std::shared_ptr<::IceInte /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openRegistryStdErr(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openRegistryStdErr(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openRegistryStdErr, iceP_name, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openRegistryStdErrAsync(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openRegistryStdErrAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openRegistryStdErr, iceP_name, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openRegistryStdErrAsync(const ::std::string& iceP_name, int iceP_count, +IceGrid::AdminSessionPrx::openRegistryStdErrAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -4162,7 +4162,7 @@ IceGrid::AdminSessionPrx::openRegistryStdErrAsync(const ::std::string& iceP_name /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openRegistryStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openRegistryStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openRegistryStdErr_name); outAsync->invoke(iceC_IceGrid_AdminSession_openRegistryStdErr_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -4196,19 +4196,19 @@ IceGrid::AdminSessionPrx::_iceI_openRegistryStdErr(const ::std::shared_ptr<::Ice /// \endcond ::std::optional<::IceGrid::FileIteratorPrx> -IceGrid::AdminSessionPrx::openRegistryStdOut(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openRegistryStdOut(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &AdminSessionPrx::_iceI_openRegistryStdOut, iceP_name, iceP_count, context).get(); } ::std::future<::std::optional<::IceGrid::FileIteratorPrx>> -IceGrid::AdminSessionPrx::openRegistryStdOutAsync(const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::openRegistryStdOutAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &AdminSessionPrx::_iceI_openRegistryStdOut, iceP_name, iceP_count, context); } ::std::function -IceGrid::AdminSessionPrx::openRegistryStdOutAsync(const ::std::string& iceP_name, int iceP_count, +IceGrid::AdminSessionPrx::openRegistryStdOutAsync(const ::std::string& iceP_name, ::std::int32_t iceP_count, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -4219,7 +4219,7 @@ IceGrid::AdminSessionPrx::openRegistryStdOutAsync(const ::std::string& iceP_name /// \cond INTERNAL void -IceGrid::AdminSessionPrx::_iceI_openRegistryStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, int iceP_count, const ::Ice::Context& context) const +IceGrid::AdminSessionPrx::_iceI_openRegistryStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::string& iceP_name, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_AdminSession_openRegistryStdOut_name); outAsync->invoke(iceC_IceGrid_AdminSession_openRegistryStdOut_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -4502,7 +4502,7 @@ IceGrid::Admin::_iceD_getServerPid(::IceInternal::Incoming& inS, const ::Ice::Cu ::std::string iceP_id; istr->readAll(iceP_id); inS.endReadParams(); - int ret = this->getServerPid(::std::move(iceP_id), current); + ::std::int32_t ret = this->getServerPid(::std::move(iceP_id), current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4885,7 +4885,7 @@ IceGrid::Admin::_iceD_getNodeProcessorSocketCount(::IceInternal::Incoming& inS, ::std::string iceP_name; istr->readAll(iceP_name); inS.endReadParams(); - int ret = this->getNodeProcessorSocketCount(::std::move(iceP_name), current); + ::std::int32_t ret = this->getNodeProcessorSocketCount(::std::move(iceP_name), current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -5287,7 +5287,7 @@ IceGrid::FileIterator::_iceD_read(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_size; + ::std::int32_t iceP_size; istr->readAll(iceP_size); inS.endReadParams(); ::Ice::StringSeq iceP_lines; @@ -5665,7 +5665,7 @@ IceGrid::ApplicationObserver::_iceD_applicationInit(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_serial; + ::std::int32_t iceP_serial; ApplicationInfoSeq iceP_applications; istr->readAll(iceP_serial, iceP_applications); istr->readPendingValues(); @@ -5682,7 +5682,7 @@ IceGrid::ApplicationObserver::_iceD_applicationAdded(::IceInternal::Incoming& in { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_serial; + ::std::int32_t iceP_serial; ApplicationInfo iceP_desc; istr->readAll(iceP_serial, iceP_desc); istr->readPendingValues(); @@ -5699,7 +5699,7 @@ IceGrid::ApplicationObserver::_iceD_applicationRemoved(::IceInternal::Incoming& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_serial; + ::std::int32_t iceP_serial; ::std::string iceP_name; istr->readAll(iceP_serial, iceP_name); inS.endReadParams(); @@ -5715,7 +5715,7 @@ IceGrid::ApplicationObserver::_iceD_applicationUpdated(::IceInternal::Incoming& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_serial; + ::std::int32_t iceP_serial; ApplicationUpdateInfo iceP_desc; istr->readAll(iceP_serial, iceP_desc); istr->readPendingValues(); @@ -6164,7 +6164,7 @@ IceGrid::AdminSession::_iceD_startUpdate(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->startUpdate(current); + ::std::int32_t ret = this->startUpdate(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -6206,7 +6206,7 @@ IceGrid::AdminSession::_iceD_openServerLog(::IceInternal::Incoming& inS, const : auto istr = inS.startReadParams(); ::std::string iceP_id; ::std::string iceP_path; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_id, iceP_path, iceP_count); inS.endReadParams(); ::std::optional ret = this->openServerLog(::std::move(iceP_id), ::std::move(iceP_path), iceP_count, current); @@ -6224,7 +6224,7 @@ IceGrid::AdminSession::_iceD_openServerStdErr(::IceInternal::Incoming& inS, cons _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_id; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_id, iceP_count); inS.endReadParams(); ::std::optional ret = this->openServerStdErr(::std::move(iceP_id), iceP_count, current); @@ -6242,7 +6242,7 @@ IceGrid::AdminSession::_iceD_openServerStdOut(::IceInternal::Incoming& inS, cons _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_id; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_id, iceP_count); inS.endReadParams(); ::std::optional ret = this->openServerStdOut(::std::move(iceP_id), iceP_count, current); @@ -6260,7 +6260,7 @@ IceGrid::AdminSession::_iceD_openNodeStdErr(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_name; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_name, iceP_count); inS.endReadParams(); ::std::optional ret = this->openNodeStdErr(::std::move(iceP_name), iceP_count, current); @@ -6278,7 +6278,7 @@ IceGrid::AdminSession::_iceD_openNodeStdOut(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_name; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_name, iceP_count); inS.endReadParams(); ::std::optional ret = this->openNodeStdOut(::std::move(iceP_name), iceP_count, current); @@ -6296,7 +6296,7 @@ IceGrid::AdminSession::_iceD_openRegistryStdErr(::IceInternal::Incoming& inS, co _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_name; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_name, iceP_count); inS.endReadParams(); ::std::optional ret = this->openRegistryStdErr(::std::move(iceP_name), iceP_count, current); @@ -6314,7 +6314,7 @@ IceGrid::AdminSession::_iceD_openRegistryStdOut(::IceInternal::Incoming& inS, co _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_name; - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_name, iceP_count); inS.endReadParams(); ::std::optional ret = this->openRegistryStdOut(::std::move(iceP_name), iceP_count, current); diff --git a/slice2cpp/slice/IceGrid/Admin.h b/slice2cpp/slice/IceGrid/Admin.h index 8dcbc8e49f24..fd3b0136e75b 100644 --- a/slice2cpp/slice/IceGrid/Admin.h +++ b/slice2cpp/slice/IceGrid/Admin.h @@ -703,7 +703,7 @@ class ICEGRID_API AdminPrx : public ::Ice::Proxy * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. * @throws IceGrid::ServerNotExistException Raised if the server doesn't exist. */ - int getServerPid(const ::std::string& id, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getServerPid(const ::std::string& id, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Get a server's system process id. The process id is operating system dependent. @@ -711,7 +711,7 @@ class ICEGRID_API AdminPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getServerPidAsync(const ::std::string& id, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getServerPidAsync(const ::std::string& id, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get a server's system process id. The process id is operating system dependent. @@ -724,13 +724,13 @@ class ICEGRID_API AdminPrx : public ::Ice::Proxy */ ::std::function getServerPidAsync(const ::std::string& id, - ::std::function response, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getServerPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::Ice::Context&) const; + void _iceI_getServerPid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -1628,7 +1628,7 @@ class ICEGRID_API AdminPrx : public ::Ice::Proxy * @throws IceGrid::NodeNotExistException Raised if the node doesn't exist. * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. */ - int getNodeProcessorSocketCount(const ::std::string& name, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getNodeProcessorSocketCount(const ::std::string& name, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Get the number of physical processor sockets for the machine running the node with the given name. @@ -1638,7 +1638,7 @@ class ICEGRID_API AdminPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future getNodeProcessorSocketCountAsync(const ::std::string& name, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getNodeProcessorSocketCountAsync(const ::std::string& name, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the number of physical processor sockets for the machine running the node with the given name. @@ -1653,13 +1653,13 @@ class ICEGRID_API AdminPrx : public ::Ice::Proxy */ ::std::function getNodeProcessorSocketCountAsync(const ::std::string& name, - ::std::function response, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getNodeProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::string&, const ::Ice::Context&) const; + void _iceI_getNodeProcessorSocketCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -2047,7 +2047,7 @@ class ICEGRID_API FileIteratorPrx : public ::Ice::Proxy> readAsync(int size, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple> readAsync(::std::int32_t size, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Read lines from the log file. @@ -2069,14 +2069,14 @@ class ICEGRID_API FileIteratorPrx : public ::Ice::Proxy - readAsync(int size, + readAsync(::std::int32_t size, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_read(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -2577,7 +2577,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::ProxyapplicationInit is called after the registration of an observer to indicate the state of the @@ -2588,7 +2588,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy applicationInitAsync(int serial, const ApplicationInfoSeq& applications, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future applicationInitAsync(::std::int32_t serial, const ApplicationInfoSeq& applications, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * applicationInit is called after the registration of an observer to indicate the state of the @@ -2603,14 +2603,14 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy - applicationInitAsync(int serial, const ApplicationInfoSeq& applications, + applicationInitAsync(::std::int32_t serial, const ApplicationInfoSeq& applications, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_applicationInit(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ApplicationInfoSeq&, const ::Ice::Context&) const; + void _iceI_applicationInit(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ApplicationInfoSeq&, const ::Ice::Context&) const; /// \endcond /** @@ -2619,7 +2619,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::ProxyapplicationAdded operation is called to notify an observer that an application was added. @@ -2628,7 +2628,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy applicationAddedAsync(int serial, const ApplicationInfo& desc, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future applicationAddedAsync(::std::int32_t serial, const ApplicationInfo& desc, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * The applicationAdded operation is called to notify an observer that an application was added. @@ -2641,14 +2641,14 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy - applicationAddedAsync(int serial, const ApplicationInfo& desc, + applicationAddedAsync(::std::int32_t serial, const ApplicationInfo& desc, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_applicationAdded(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ApplicationInfo&, const ::Ice::Context&) const; + void _iceI_applicationAdded(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ApplicationInfo&, const ::Ice::Context&) const; /// \endcond /** @@ -2657,7 +2657,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::ProxyapplicationRemoved operation is called to notify an observer that an application was removed. @@ -2666,7 +2666,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy applicationRemovedAsync(int serial, const ::std::string& name, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future applicationRemovedAsync(::std::int32_t serial, const ::std::string& name, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * The applicationRemoved operation is called to notify an observer that an application was removed. @@ -2679,14 +2679,14 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy - applicationRemovedAsync(int serial, const ::std::string& name, + applicationRemovedAsync(::std::int32_t serial, const ::std::string& name, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_applicationRemoved(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::std::string&, const ::Ice::Context&) const; + void _iceI_applicationRemoved(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::std::string&, const ::Ice::Context&) const; /// \endcond /** @@ -2695,7 +2695,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::ProxyapplicationUpdated operation is called to notify an observer that an application was updated. @@ -2704,7 +2704,7 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy applicationUpdatedAsync(int serial, const ApplicationUpdateInfo& desc, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future applicationUpdatedAsync(::std::int32_t serial, const ApplicationUpdateInfo& desc, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * The applicationUpdated operation is called to notify an observer that an application was updated. @@ -2717,14 +2717,14 @@ class ICEGRID_API ApplicationObserverPrx : public ::Ice::Proxy - applicationUpdatedAsync(int serial, const ApplicationUpdateInfo& desc, + applicationUpdatedAsync(::std::int32_t serial, const ApplicationUpdateInfo& desc, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_applicationUpdated(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ApplicationUpdateInfo&, const ::Ice::Context&) const; + void _iceI_applicationUpdated(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ApplicationUpdateInfo&, const ::Ice::Context&) const; /// \endcond /** @@ -3400,14 +3400,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy startUpdateAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> startUpdateAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Acquires an exclusive lock to start updating the registry applications. @@ -3418,13 +3418,13 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - startUpdateAsync(::std::function response, + startUpdateAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_startUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_startUpdate(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -3505,7 +3505,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openServerLog(const ::std::string& id, const ::std::string& path, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openServerLog(const ::std::string& id, const ::std::string& path, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given server log file for reading. The file can be read with the returned file iterator. @@ -3517,7 +3517,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openServerLogAsync(const ::std::string& id, const ::std::string& path, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openServerLogAsync(const ::std::string& id, const ::std::string& path, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given server log file for reading. The file can be read with the returned file iterator. @@ -3533,14 +3533,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openServerLogAsync(const ::std::string& id, const ::std::string& path, int count, + openServerLogAsync(const ::std::string& id, const ::std::string& path, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openServerLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openServerLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3555,7 +3555,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openServerStdErr(const ::std::string& id, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openServerStdErr(const ::std::string& id, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given server stderr file for reading. The file can be read with the returned file iterator. @@ -3565,7 +3565,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openServerStdErrAsync(const ::std::string& id, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openServerStdErrAsync(const ::std::string& id, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given server stderr file for reading. The file can be read with the returned file iterator. @@ -3579,14 +3579,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openServerStdErrAsync(const ::std::string& id, int count, + openServerStdErrAsync(const ::std::string& id, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openServerStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openServerStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3601,7 +3601,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openServerStdOut(const ::std::string& id, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openServerStdOut(const ::std::string& id, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given server stdout file for reading. The file can be read with the returned file iterator. @@ -3611,7 +3611,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openServerStdOutAsync(const ::std::string& id, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openServerStdOutAsync(const ::std::string& id, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given server stdout file for reading. The file can be read with the returned file iterator. @@ -3625,14 +3625,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openServerStdOutAsync(const ::std::string& id, int count, + openServerStdOutAsync(const ::std::string& id, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openServerStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openServerStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3646,7 +3646,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openNodeStdErr(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openNodeStdErr(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given node stderr file for reading. The file can be read with the returned file iterator. @@ -3656,7 +3656,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openNodeStdErrAsync(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openNodeStdErrAsync(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given node stderr file for reading. The file can be read with the returned file iterator. @@ -3670,14 +3670,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openNodeStdErrAsync(const ::std::string& name, int count, + openNodeStdErrAsync(const ::std::string& name, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openNodeStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openNodeStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3691,7 +3691,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openNodeStdOut(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openNodeStdOut(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given node stdout file for reading. The file can be read with the returned file iterator. @@ -3701,7 +3701,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openNodeStdOutAsync(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openNodeStdOutAsync(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given node stdout file for reading. The file can be read with the returned file iterator. @@ -3715,14 +3715,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openNodeStdOutAsync(const ::std::string& name, int count, + openNodeStdOutAsync(const ::std::string& name, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openNodeStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openNodeStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3736,7 +3736,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openRegistryStdErr(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openRegistryStdErr(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given registry stderr file for reading. The file can be read with the returned file iterator. @@ -3746,7 +3746,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openRegistryStdErrAsync(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openRegistryStdErrAsync(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given registry stderr file for reading. The file can be read with the returned file iterator. @@ -3760,14 +3760,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openRegistryStdErrAsync(const ::std::string& name, int count, + openRegistryStdErrAsync(const ::std::string& name, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openRegistryStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openRegistryStdErr(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3781,7 +3781,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy openRegistryStdOut(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional openRegistryStdOut(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Open the given registry stdout file for reading. The file can be read with the returned file iterator. @@ -3791,7 +3791,7 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy> openRegistryStdOutAsync(const ::std::string& name, int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> openRegistryStdOutAsync(const ::std::string& name, ::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Open the given registry stdout file for reading. The file can be read with the returned file iterator. @@ -3805,14 +3805,14 @@ class ICEGRID_API AdminSessionPrx : public ::Ice::Proxy - openRegistryStdOutAsync(const ::std::string& name, int count, + openRegistryStdOutAsync(const ::std::string& name, ::std::int32_t count, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_openRegistryStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, int, const ::Ice::Context&) const; + void _iceI_openRegistryStdOut(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::string&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -3948,7 +3948,7 @@ struct ServerInfo /** * The application revision. */ - int revision; + ::std::int32_t revision; /** * The server node. */ @@ -3966,7 +3966,7 @@ struct ServerInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&> ice_tuple() const { return std::tie(application, uuid, revision, node, descriptor, sessionId); } @@ -4006,7 +4006,7 @@ struct NodeInfo * The number of processor threads on the node. For example, nProcessors is 8 on a computer with a single * quad-core processor and two HT threads per core. */ - int nProcessors; + ::std::int32_t nProcessors; /** * The path to the node data directory. */ @@ -4016,7 +4016,7 @@ struct NodeInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(name, os, hostname, release, version, machine, nProcessors, dataDir); } @@ -4089,7 +4089,7 @@ struct ApplicationInfo /** * The creation time. */ - long long int createTime; + ::std::int64_t createTime; /** * The user who created the application. */ @@ -4097,7 +4097,7 @@ struct ApplicationInfo /** * The update time. */ - long long int updateTime; + ::std::int64_t updateTime; /** * The user who updated the application. */ @@ -4105,7 +4105,7 @@ struct ApplicationInfo /** * The application revision number. */ - int revision; + ::std::int32_t revision; /** * The application descriptor */ @@ -4115,7 +4115,7 @@ struct ApplicationInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(uuid, createTime, createUser, updateTime, updateUser, revision, descriptor); } @@ -4130,7 +4130,7 @@ struct ApplicationUpdateInfo /** * The update time. */ - long long int updateTime; + ::std::int64_t updateTime; /** * The user who updated the application. */ @@ -4138,7 +4138,7 @@ struct ApplicationUpdateInfo /** * The application revision number. */ - int revision; + ::std::int32_t revision; /** * The update descriptor. */ @@ -4148,7 +4148,7 @@ struct ApplicationUpdateInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(updateTime, updateUser, revision, descriptor); } @@ -4171,7 +4171,7 @@ struct ServerDynamicInfo /** * The process id of the server. */ - int pid; + ::std::int32_t pid; /** * Indicates whether the server is enabled. */ @@ -4181,7 +4181,7 @@ struct ServerDynamicInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, state, pid, enabled); } @@ -4478,7 +4478,7 @@ class ICEGRID_API Admin : public virtual ::Ice::Object * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. * @throws IceGrid::ServerNotExistException Raised if the server doesn't exist. */ - virtual int getServerPid(::std::string id, const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getServerPid(::std::string id, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getServerPid(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -4798,7 +4798,7 @@ class ICEGRID_API Admin : public virtual ::Ice::Object * @throws IceGrid::NodeNotExistException Raised if the node doesn't exist. * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. */ - virtual int getNodeProcessorSocketCount(::std::string name, const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getNodeProcessorSocketCount(::std::string name, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getNodeProcessorSocketCount(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -4970,7 +4970,7 @@ class ICEGRID_API FileIterator : public virtual ::Ice::Object * @return True if EOF is encountered. * @throws IceGrid::FileNotAvailableException Raised if there was a problem to read lines from the file. */ - virtual bool read(int size, ::Ice::StringSeq& lines, const ::Ice::Current& current) = 0; + virtual bool read(::std::int32_t size, ::Ice::StringSeq& lines, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_read(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5204,7 +5204,7 @@ class ICEGRID_API ApplicationObserver : public virtual ::Ice::Object * @param applications The applications currently registered with the registry. * @param current The Current object for the invocation. */ - virtual void applicationInit(int serial, ApplicationInfoSeq applications, const ::Ice::Current& current) = 0; + virtual void applicationInit(::std::int32_t serial, ApplicationInfoSeq applications, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_applicationInit(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5215,7 +5215,7 @@ class ICEGRID_API ApplicationObserver : public virtual ::Ice::Object * @param desc The descriptor of the new application. * @param current The Current object for the invocation. */ - virtual void applicationAdded(int serial, ApplicationInfo desc, const ::Ice::Current& current) = 0; + virtual void applicationAdded(::std::int32_t serial, ApplicationInfo desc, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_applicationAdded(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5226,7 +5226,7 @@ class ICEGRID_API ApplicationObserver : public virtual ::Ice::Object * @param name The name of the application that was removed. * @param current The Current object for the invocation. */ - virtual void applicationRemoved(int serial, ::std::string name, const ::Ice::Current& current) = 0; + virtual void applicationRemoved(::std::int32_t serial, ::std::string name, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_applicationRemoved(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5237,7 +5237,7 @@ class ICEGRID_API ApplicationObserver : public virtual ::Ice::Object * @param desc The descriptor of the update. * @param current The Current object for the invocation. */ - virtual void applicationUpdated(int serial, ApplicationUpdateInfo desc, const ::Ice::Current& current) = 0; + virtual void applicationUpdated(::std::int32_t serial, ApplicationUpdateInfo desc, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_applicationUpdated(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5526,7 +5526,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::AccessDeniedException Raised if the exclusive lock can't be acquired. This might happen if the lock is * currently acquired by another session. */ - virtual int startUpdate(const ::Ice::Current& current) = 0; + virtual ::std::int32_t startUpdate(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_startUpdate(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5565,7 +5565,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. * @throws IceGrid::ServerNotExistException Raised if the server doesn't exist. */ - virtual ::std::optional openServerLog(::std::string id, ::std::string path, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openServerLog(::std::string id, ::std::string path, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openServerLog(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5582,7 +5582,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. * @throws IceGrid::ServerNotExistException Raised if the server doesn't exist. */ - virtual ::std::optional openServerStdErr(::std::string id, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openServerStdErr(::std::string id, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openServerStdErr(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5599,7 +5599,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. * @throws IceGrid::ServerNotExistException Raised if the server doesn't exist. */ - virtual ::std::optional openServerStdOut(::std::string id, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openServerStdOut(::std::string id, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openServerStdOut(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5615,7 +5615,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::NodeNotExistException Raised if the node doesn't exist. * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. */ - virtual ::std::optional openNodeStdErr(::std::string name, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openNodeStdErr(::std::string name, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openNodeStdErr(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5631,7 +5631,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::NodeNotExistException Raised if the node doesn't exist. * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. */ - virtual ::std::optional openNodeStdOut(::std::string name, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openNodeStdOut(::std::string name, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openNodeStdOut(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5647,7 +5647,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::RegistryNotExistException Raised if the registry doesn't exist. * @throws IceGrid::RegistryUnreachableException Raised if the registry could not be reached. */ - virtual ::std::optional openRegistryStdErr(::std::string name, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openRegistryStdErr(::std::string name, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openRegistryStdErr(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -5663,7 +5663,7 @@ class ICEGRID_API AdminSession : public virtual ::Glacier2::Session * @throws IceGrid::RegistryNotExistException Raised if the registry doesn't exist. * @throws IceGrid::RegistryUnreachableException Raised if the registry could not be reached. */ - virtual ::std::optional openRegistryStdOut(::std::string name, int count, const ::Ice::Current& current) = 0; + virtual ::std::optional openRegistryStdOut(::std::string name, ::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_openRegistryStdOut(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/slice/IceGrid/Registry.cpp b/slice2cpp/slice/IceGrid/Registry.cpp index 3f0bee01e5f3..7ee8ecfb698a 100644 --- a/slice2cpp/slice/IceGrid/Registry.cpp +++ b/slice2cpp/slice/IceGrid/Registry.cpp @@ -483,30 +483,30 @@ IceGrid::RegistryPrx::_iceI_createAdminSessionFromSecureConnection(const ::std:: } /// \endcond -int +::std::int32_t IceGrid::RegistryPrx::getSessionTimeout(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &RegistryPrx::_iceI_getSessionTimeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RegistryPrx::_iceI_getSessionTimeout, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::RegistryPrx::getSessionTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RegistryPrx::_iceI_getSessionTimeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RegistryPrx::_iceI_getSessionTimeout, context); } ::std::function -IceGrid::RegistryPrx::getSessionTimeoutAsync(::std::function response, +IceGrid::RegistryPrx::getSessionTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::RegistryPrx::_iceI_getSessionTimeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::RegistryPrx::_iceI_getSessionTimeout, context); } /// \cond INTERNAL void -IceGrid::RegistryPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::RegistryPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Registry_getSessionTimeout_name); outAsync->invoke(iceC_IceGrid_Registry_getSessionTimeout_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -515,30 +515,30 @@ IceGrid::RegistryPrx::_iceI_getSessionTimeout(const ::std::shared_ptr<::IceInter } /// \endcond -int +::std::int32_t IceGrid::RegistryPrx::getACMTimeout(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &RegistryPrx::_iceI_getACMTimeout, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RegistryPrx::_iceI_getACMTimeout, context).get(); } -::std::future +::std::future<::std::int32_t> IceGrid::RegistryPrx::getACMTimeoutAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RegistryPrx::_iceI_getACMTimeout, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RegistryPrx::_iceI_getACMTimeout, context); } ::std::function -IceGrid::RegistryPrx::getACMTimeoutAsync(::std::function response, +IceGrid::RegistryPrx::getACMTimeoutAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::RegistryPrx::_iceI_getACMTimeout, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &IceGrid::RegistryPrx::_iceI_getACMTimeout, context); } /// \cond INTERNAL void -IceGrid::RegistryPrx::_iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +IceGrid::RegistryPrx::_iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceGrid_Registry_getACMTimeout_name); outAsync->invoke(iceC_IceGrid_Registry_getACMTimeout_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -886,7 +886,7 @@ IceGrid::Registry::_iceD_getSessionTimeout(::IceInternal::Incoming& inS, const : { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getSessionTimeout(current); + ::std::int32_t ret = this->getSessionTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -900,7 +900,7 @@ IceGrid::Registry::_iceD_getACMTimeout(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getACMTimeout(current); + ::std::int32_t ret = this->getACMTimeout(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/slice/IceGrid/Registry.h b/slice2cpp/slice/IceGrid/Registry.h index de01669d28fb..05f2ff3a081c 100644 --- a/slice2cpp/slice/IceGrid/Registry.h +++ b/slice2cpp/slice/IceGrid/Registry.h @@ -505,7 +505,7 @@ class ICEGRID_API RegistryPrx : public ::Ice::Proxy getSessionTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getSessionTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the session timeout. If a client or administrative client doesn't call the session keepAlive method in @@ -529,13 +529,13 @@ class ICEGRID_API RegistryPrx : public ::Ice::Proxy - getSessionTimeoutAsync(::std::function response, + getSessionTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getSessionTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -544,7 +544,7 @@ class ICEGRID_API RegistryPrx : public ::Ice::Proxy getACMTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getACMTimeoutAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Get the value of the ACM timeout. Clients supporting ACM connection heartbeats can enable them instead of @@ -564,13 +564,13 @@ class ICEGRID_API RegistryPrx : public ::Ice::Proxy - getACMTimeoutAsync(::std::function response, + getACMTimeoutAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getACMTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -960,7 +960,7 @@ class ICEGRID_API Registry : public virtual ::Ice::Object * @see Session#keepAlive * @see AdminSession#keepAlive */ - virtual int getSessionTimeout(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getSessionTimeout(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getSessionTimeout(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -971,7 +971,7 @@ class ICEGRID_API Registry : public virtual ::Ice::Object * @param current The Current object for the invocation. * @return The timeout (in seconds). */ - virtual int getACMTimeout(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getACMTimeout(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getACMTimeout(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/slice/IceGrid/Session.cpp b/slice2cpp/slice/IceGrid/Session.cpp index 76c9dd656dd2..d5f947006a3d 100644 --- a/slice2cpp/slice/IceGrid/Session.cpp +++ b/slice2cpp/slice/IceGrid/Session.cpp @@ -252,19 +252,19 @@ IceGrid::SessionPrx::_iceI_releaseObject(const ::std::shared_ptr<::IceInternal:: /// \endcond void -IceGrid::SessionPrx::setAllocationTimeout(int iceP_timeout, const ::Ice::Context& context) const +IceGrid::SessionPrx::setAllocationTimeout(::std::int32_t iceP_timeout, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &SessionPrx::_iceI_setAllocationTimeout, iceP_timeout, context).get(); } ::std::future -IceGrid::SessionPrx::setAllocationTimeoutAsync(int iceP_timeout, const ::Ice::Context& context) const +IceGrid::SessionPrx::setAllocationTimeoutAsync(::std::int32_t iceP_timeout, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &SessionPrx::_iceI_setAllocationTimeout, iceP_timeout, context); } ::std::function -IceGrid::SessionPrx::setAllocationTimeoutAsync(int iceP_timeout, +IceGrid::SessionPrx::setAllocationTimeoutAsync(::std::int32_t iceP_timeout, ::std::function response, ::std::function ex, ::std::function sent, @@ -275,7 +275,7 @@ IceGrid::SessionPrx::setAllocationTimeoutAsync(int iceP_timeout, /// \cond INTERNAL void -IceGrid::SessionPrx::_iceI_setAllocationTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_timeout, const ::Ice::Context& context) const +IceGrid::SessionPrx::_iceI_setAllocationTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_timeout, const ::Ice::Context& context) const { outAsync->invoke(iceC_IceGrid_Session_setAllocationTimeout_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -394,7 +394,7 @@ IceGrid::Session::_iceD_setAllocationTimeout(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_timeout; + ::std::int32_t iceP_timeout; istr->readAll(iceP_timeout); inS.endReadParams(); this->setAllocationTimeout(iceP_timeout, current); diff --git a/slice2cpp/slice/IceGrid/Session.h b/slice2cpp/slice/IceGrid/Session.h index a65d5fec0579..8d3df42ee25c 100644 --- a/slice2cpp/slice/IceGrid/Session.h +++ b/slice2cpp/slice/IceGrid/Session.h @@ -246,7 +246,7 @@ class ICEGRID_API SessionPrx : public ::Ice::Proxy setAllocationTimeoutAsync(int timeout, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setAllocationTimeoutAsync(::std::int32_t timeout, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Set the allocation timeout. If no objects are available for an allocation request, a call to @@ -270,14 +270,14 @@ class ICEGRID_API SessionPrx : public ::Ice::Proxy - setAllocationTimeoutAsync(int timeout, + setAllocationTimeoutAsync(::std::int32_t timeout, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setAllocationTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_setAllocationTimeout(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -448,7 +448,7 @@ class ICEGRID_API Session : public virtual ::Glacier2::Session * @param timeout The timeout in milliseconds. * @param current The Current object for the invocation. */ - virtual void setAllocationTimeout(int timeout, const ::Ice::Current& current) = 0; + virtual void setAllocationTimeout(::std::int32_t timeout, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setAllocationTimeout(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/slice/IcePatch2/FileInfo.h b/slice2cpp/slice/IcePatch2/FileInfo.h index 4ecbf1143dc3..dd1d3ffcb0a6 100644 --- a/slice2cpp/slice/IcePatch2/FileInfo.h +++ b/slice2cpp/slice/IcePatch2/FileInfo.h @@ -81,7 +81,7 @@ struct FileInfo /** * The size of the compressed file in number of bytes. */ - int size; + ::std::int32_t size; /** * The executable flag. */ @@ -91,7 +91,7 @@ struct FileInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(path, checksum, size, executable); } @@ -114,7 +114,7 @@ struct LargeFileInfo /** * The size of the compressed file in number of bytes. */ - long long int size; + ::std::int64_t size; /** * The executable flag. */ @@ -124,7 +124,7 @@ struct LargeFileInfo * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(path, checksum, size, executable); } diff --git a/slice2cpp/slice/IcePatch2/FileServer.cpp b/slice2cpp/slice/IcePatch2/FileServer.cpp index f5d08f25e5c2..fc2612ae6e28 100644 --- a/slice2cpp/slice/IcePatch2/FileServer.cpp +++ b/slice2cpp/slice/IcePatch2/FileServer.cpp @@ -72,19 +72,19 @@ const ::std::string iceC_IcePatch2_FileServer_getLargeFileCompressed_name = "get } ::IcePatch2::FileInfoSeq -IcePatch2::FileServerPrx::getFileInfoSeq(int iceP_partition, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getFileInfoSeq(::std::int32_t iceP_partition, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &FileServerPrx::_iceI_getFileInfoSeq, iceP_partition, context).get(); } ::std::future<::IcePatch2::FileInfoSeq> -IcePatch2::FileServerPrx::getFileInfoSeqAsync(int iceP_partition, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getFileInfoSeqAsync(::std::int32_t iceP_partition, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &FileServerPrx::_iceI_getFileInfoSeq, iceP_partition, context); } ::std::function -IcePatch2::FileServerPrx::getFileInfoSeqAsync(int iceP_partition, +IcePatch2::FileServerPrx::getFileInfoSeqAsync(::std::int32_t iceP_partition, ::std::function response, ::std::function ex, ::std::function sent, @@ -95,7 +95,7 @@ IcePatch2::FileServerPrx::getFileInfoSeqAsync(int iceP_partition, /// \cond INTERNAL void -IcePatch2::FileServerPrx::_iceI_getFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_partition, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::_iceI_getFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_partition, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IcePatch2_FileServer_getFileInfoSeq_name); outAsync->invoke(iceC_IcePatch2_FileServer_getFileInfoSeq_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -125,19 +125,19 @@ IcePatch2::FileServerPrx::_iceI_getFileInfoSeq(const ::std::shared_ptr<::IceInte /// \endcond ::IcePatch2::LargeFileInfoSeq -IcePatch2::FileServerPrx::getLargeFileInfoSeq(int iceP_partition, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getLargeFileInfoSeq(::std::int32_t iceP_partition, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &FileServerPrx::_iceI_getLargeFileInfoSeq, iceP_partition, context).get(); } ::std::future<::IcePatch2::LargeFileInfoSeq> -IcePatch2::FileServerPrx::getLargeFileInfoSeqAsync(int iceP_partition, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getLargeFileInfoSeqAsync(::std::int32_t iceP_partition, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &FileServerPrx::_iceI_getLargeFileInfoSeq, iceP_partition, context); } ::std::function -IcePatch2::FileServerPrx::getLargeFileInfoSeqAsync(int iceP_partition, +IcePatch2::FileServerPrx::getLargeFileInfoSeqAsync(::std::int32_t iceP_partition, ::std::function response, ::std::function ex, ::std::function sent, @@ -148,7 +148,7 @@ IcePatch2::FileServerPrx::getLargeFileInfoSeqAsync(int iceP_partition, /// \cond INTERNAL void -IcePatch2::FileServerPrx::_iceI_getLargeFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_partition, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::_iceI_getLargeFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_partition, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IcePatch2_FileServer_getLargeFileInfoSeq_name); outAsync->invoke(iceC_IcePatch2_FileServer_getLargeFileInfoSeq_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -238,20 +238,20 @@ IcePatch2::FileServerPrx::_iceI_getChecksum(const ::std::shared_ptr<::IceInterna /// \endcond ::Ice::ByteSeq -IcePatch2::FileServerPrx::getFileCompressed(const ::std::string& iceP_path, int iceP_pos, int iceP_num, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getFileCompressed(const ::std::string& iceP_path, ::std::int32_t iceP_pos, ::std::int32_t iceP_num, const ::Ice::Context& context) const { return _makePromiseOutgoing<::Ice::ByteSeq>(true, this, &FileServerPrx::_iceI_getFileCompressed, iceP_path, iceP_pos, iceP_num, context).get(); } ::std::future<::Ice::ByteSeq> -IcePatch2::FileServerPrx::getFileCompressedAsync(const ::std::string& iceP_path, int iceP_pos, int iceP_num, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getFileCompressedAsync(const ::std::string& iceP_path, ::std::int32_t iceP_pos, ::std::int32_t iceP_num, const ::Ice::Context& context) const { return _makePromiseOutgoing<::Ice::ByteSeq, ::std::promise>(false, this, &FileServerPrx::_iceI_getFileCompressed, iceP_path, iceP_pos, iceP_num, context); } ::std::function -IcePatch2::FileServerPrx::getFileCompressedAsync(const ::std::string& iceP_path, int iceP_pos, int iceP_num, - ::std::function)> response, +IcePatch2::FileServerPrx::getFileCompressedAsync(const ::std::string& iceP_path, ::std::int32_t iceP_pos, ::std::int32_t iceP_num, + ::std::function)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -263,7 +263,7 @@ IcePatch2::FileServerPrx::getFileCompressedAsync(const ::std::string& iceP_path, read = [response](::Ice::InputStream* istr) { istr->startEncapsulation(); - ::std::pair ret; + ::std::pair ret; istr->readAll(ret); istr->endEncapsulation(); try @@ -306,7 +306,7 @@ IcePatch2::FileServerPrx::getFileCompressedAsync(const ::std::string& iceP_path, /// \cond INTERNAL void -IcePatch2::FileServerPrx::_iceI_getFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>& outAsync, const ::std::string& iceP_path, int iceP_pos, int iceP_num, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::_iceI_getFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>& outAsync, const ::std::string& iceP_path, ::std::int32_t iceP_pos, ::std::int32_t iceP_num, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IcePatch2_FileServer_getFileCompressed_name); outAsync->invoke(iceC_IcePatch2_FileServer_getFileCompressed_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -336,20 +336,20 @@ IcePatch2::FileServerPrx::_iceI_getFileCompressed(const ::std::shared_ptr<::IceI /// \endcond ::Ice::ByteSeq -IcePatch2::FileServerPrx::getLargeFileCompressed(const ::std::string& iceP_path, long long int iceP_pos, int iceP_num, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getLargeFileCompressed(const ::std::string& iceP_path, ::std::int64_t iceP_pos, ::std::int32_t iceP_num, const ::Ice::Context& context) const { return _makePromiseOutgoing<::Ice::ByteSeq>(true, this, &FileServerPrx::_iceI_getLargeFileCompressed, iceP_path, iceP_pos, iceP_num, context).get(); } ::std::future<::Ice::ByteSeq> -IcePatch2::FileServerPrx::getLargeFileCompressedAsync(const ::std::string& iceP_path, long long int iceP_pos, int iceP_num, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::getLargeFileCompressedAsync(const ::std::string& iceP_path, ::std::int64_t iceP_pos, ::std::int32_t iceP_num, const ::Ice::Context& context) const { return _makePromiseOutgoing<::Ice::ByteSeq, ::std::promise>(false, this, &FileServerPrx::_iceI_getLargeFileCompressed, iceP_path, iceP_pos, iceP_num, context); } ::std::function -IcePatch2::FileServerPrx::getLargeFileCompressedAsync(const ::std::string& iceP_path, long long int iceP_pos, int iceP_num, - ::std::function)> response, +IcePatch2::FileServerPrx::getLargeFileCompressedAsync(const ::std::string& iceP_path, ::std::int64_t iceP_pos, ::std::int32_t iceP_num, + ::std::function)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -361,7 +361,7 @@ IcePatch2::FileServerPrx::getLargeFileCompressedAsync(const ::std::string& iceP_ read = [response](::Ice::InputStream* istr) { istr->startEncapsulation(); - ::std::pair ret; + ::std::pair ret; istr->readAll(ret); istr->endEncapsulation(); try @@ -400,7 +400,7 @@ IcePatch2::FileServerPrx::getLargeFileCompressedAsync(const ::std::string& iceP_ /// \cond INTERNAL void -IcePatch2::FileServerPrx::_iceI_getLargeFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>& outAsync, const ::std::string& iceP_path, long long int iceP_pos, int iceP_num, const ::Ice::Context& context) const +IcePatch2::FileServerPrx::_iceI_getLargeFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>& outAsync, const ::std::string& iceP_path, ::std::int64_t iceP_pos, ::std::int32_t iceP_num, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IcePatch2_FileServer_getLargeFileCompressed_name); outAsync->invoke(iceC_IcePatch2_FileServer_getLargeFileCompressed_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context, @@ -495,7 +495,7 @@ IcePatch2::FileServer::_iceD_getFileInfoSeq(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_partition; + ::std::int32_t iceP_partition; istr->readAll(iceP_partition); inS.endReadParams(); FileInfoSeq ret = this->getFileInfoSeq(iceP_partition, current); @@ -512,7 +512,7 @@ IcePatch2::FileServer::_iceD_getLargeFileInfoSeq(::IceInternal::Incoming& inS, c { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_partition; + ::std::int32_t iceP_partition; istr->readAll(iceP_partition); inS.endReadParams(); LargeFileInfoSeq ret = this->getLargeFileInfoSeq(iceP_partition, current); @@ -558,12 +558,12 @@ IcePatch2::FileServer::_iceD_getFileCompressed(::IceInternal::Incoming& inS, con _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_path; - int iceP_pos; - int iceP_num; + ::std::int32_t iceP_pos; + ::std::int32_t iceP_num; istr->readAll(iceP_path, iceP_pos, iceP_num); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::std::pair& ret) + auto responseCB = [inA](const ::std::pair& ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -582,12 +582,12 @@ IcePatch2::FileServer::_iceD_getLargeFileCompressed(::IceInternal::Incoming& inS _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); ::std::string iceP_path; - long long int iceP_pos; - int iceP_num; + ::std::int64_t iceP_pos; + ::std::int32_t iceP_num; istr->readAll(iceP_path, iceP_pos, iceP_num); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const ::std::pair& ret) + auto responseCB = [inA](const ::std::pair& ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/slice/IcePatch2/FileServer.h b/slice2cpp/slice/IcePatch2/FileServer.h index 5c945f76e881..4ee21f55d777 100644 --- a/slice2cpp/slice/IcePatch2/FileServer.h +++ b/slice2cpp/slice/IcePatch2/FileServer.h @@ -79,7 +79,7 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy This operation is deprecated and @@ -90,7 +90,7 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy getFileInfoSeqAsync(int partition, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ICE_DEPRECATED_API("getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead.") ::std::future getFileInfoSeqAsync(::std::int32_t partition, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Return file information for the specified partition.

This operation is deprecated and @@ -105,14 +105,14 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy - getFileInfoSeqAsync(int partition, + getFileInfoSeqAsync(::std::int32_t partition, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_getFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -122,7 +122,7 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy getLargeFileInfoSeqAsync(int partition, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future getLargeFileInfoSeqAsync(::std::int32_t partition, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Returns file information for the specified partition. @@ -142,14 +142,14 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy - getLargeFileInfoSeqAsync(int partition, + getLargeFileInfoSeqAsync(::std::int32_t partition, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getLargeFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_getLargeFileInfoSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -235,7 +235,7 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy getFileCompressedAsync(const ::std::string& path, int pos, int num, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ICE_DEPRECATED_API("getFileCompressed() is deprecated, use getLargeFileCompressed() instead.") ::std::future<::Ice::ByteSeq> getFileCompressedAsync(const ::std::string& path, ::std::int32_t pos, ::std::int32_t num, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Read the specified file. This operation may only return fewer bytes than requested in case there was an end-of-file @@ -267,14 +267,14 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy - getFileCompressedAsync(const ::std::string& path, int pos, int num, - ::std::function)> response, + getFileCompressedAsync(const ::std::string& path, ::std::int32_t pos, ::std::int32_t num, + ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>&, const ::std::string&, int, int, const ::Ice::Context&) const; + void _iceI_getFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>&, const ::std::string&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -287,7 +287,7 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy getLargeFileCompressedAsync(const ::std::string& path, long long int pos, int num, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::Ice::ByteSeq> getLargeFileCompressedAsync(const ::std::string& path, ::std::int64_t pos, ::std::int32_t num, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Read the specified file. This operation may only return fewer bytes than requested in case there was an @@ -313,14 +313,14 @@ class ICEPATCH2_API FileServerPrx : public ::Ice::Proxy - getLargeFileCompressedAsync(const ::std::string& path, long long int pos, int num, - ::std::function)> response, + getLargeFileCompressedAsync(const ::std::string& path, ::std::int64_t pos, ::std::int32_t num, + ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getLargeFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>&, const ::std::string&, long long int, int, const ::Ice::Context&) const; + void _iceI_getLargeFileCompressed(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ByteSeq>>&, const ::std::string&, ::std::int64_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -547,7 +547,7 @@ class ICEPATCH2_API FileServer : public virtual ::Ice::Object * * @deprecated getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead. */ - ICE_DEPRECATED_API("getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead.") virtual FileInfoSeq getFileInfoSeq(int partition, const ::Ice::Current& current) const = 0; + ICE_DEPRECATED_API("getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead.") virtual FileInfoSeq getFileInfoSeq(::std::int32_t partition, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getFileInfoSeq(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -559,7 +559,7 @@ class ICEPATCH2_API FileServer : public virtual ::Ice::Object * @return A sequence containing information about the files in the specified partition. * @throws IcePatch2::PartitionOutOfRangeException If the partition number is out of range. */ - virtual LargeFileInfoSeq getLargeFileInfoSeq(int partition, const ::Ice::Current& current) const = 0; + virtual LargeFileInfoSeq getLargeFileInfoSeq(::std::int32_t partition, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getLargeFileInfoSeq(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -602,7 +602,7 @@ class ICEPATCH2_API FileServer : public virtual ::Ice::Object * * @deprecated getFileCompressed() is deprecated, use getLargeFileCompressed() instead. */ - ICE_DEPRECATED_API("getFileCompressed() is deprecated, use getLargeFileCompressed() instead.") virtual void getFileCompressedAsync(::std::string path, int pos, int num, ::std::function& returnValue)> response, ::std::function exception, const ::Ice::Current& current) const = 0; + ICE_DEPRECATED_API("getFileCompressed() is deprecated, use getLargeFileCompressed() instead.") virtual void getFileCompressedAsync(::std::string path, ::std::int32_t pos, ::std::int32_t num, ::std::function& returnValue)> response, ::std::function exception, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getFileCompressed(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond @@ -618,7 +618,7 @@ class ICEPATCH2_API FileServer : public virtual ::Ice::Object * @param current The Current object for the invocation. * @throws IcePatch2::FileAccessException If an error occurred while trying to read the file. */ - virtual void getLargeFileCompressedAsync(::std::string path, long long int pos, int num, ::std::function& returnValue)> response, ::std::function exception, const ::Ice::Current& current) const = 0; + virtual void getLargeFileCompressedAsync(::std::string path, ::std::int64_t pos, ::std::int32_t num, ::std::function& returnValue)> response, ::std::function exception, const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getLargeFileCompressed(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/slice/IceStorm/IceStorm.cpp b/slice2cpp/slice/IceStorm/IceStorm.cpp index 65b98964bbac..99970f7bc032 100644 --- a/slice2cpp/slice/IceStorm/IceStorm.cpp +++ b/slice2cpp/slice/IceStorm/IceStorm.cpp @@ -310,19 +310,19 @@ IceStorm::TopicPrx::_iceI_unsubscribe(const ::std::shared_ptr<::IceInternal::Out /// \endcond void -IceStorm::TopicPrx::link(const ::std::optional& iceP_linkTo, int iceP_cost, const ::Ice::Context& context) const +IceStorm::TopicPrx::link(const ::std::optional& iceP_linkTo, ::std::int32_t iceP_cost, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TopicPrx::_iceI_link, iceP_linkTo, iceP_cost, context).get(); } ::std::future -IceStorm::TopicPrx::linkAsync(const ::std::optional& iceP_linkTo, int iceP_cost, const ::Ice::Context& context) const +IceStorm::TopicPrx::linkAsync(const ::std::optional& iceP_linkTo, ::std::int32_t iceP_cost, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TopicPrx::_iceI_link, iceP_linkTo, iceP_cost, context); } ::std::function -IceStorm::TopicPrx::linkAsync(const ::std::optional& iceP_linkTo, int iceP_cost, +IceStorm::TopicPrx::linkAsync(const ::std::optional& iceP_linkTo, ::std::int32_t iceP_cost, ::std::function response, ::std::function ex, ::std::function sent, @@ -333,7 +333,7 @@ IceStorm::TopicPrx::linkAsync(const ::std::optional& iceP_linkTo, int /// \cond INTERNAL void -IceStorm::TopicPrx::_iceI_link(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_linkTo, int iceP_cost, const ::Ice::Context& context) const +IceStorm::TopicPrx::_iceI_link(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_linkTo, ::std::int32_t iceP_cost, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_IceStorm_Topic_link_name); outAsync->invoke(iceC_IceStorm_Topic_link_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -866,7 +866,7 @@ IceStorm::Topic::_iceD_link(::IceInternal::Incoming& inS, const ::Ice::Current& _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); ::std::optional iceP_linkTo; - int iceP_cost; + ::std::int32_t iceP_cost; istr->readAll(iceP_linkTo, iceP_cost); inS.endReadParams(); this->link(::std::move(iceP_linkTo), iceP_cost, current); diff --git a/slice2cpp/slice/IceStorm/IceStorm.h b/slice2cpp/slice/IceStorm/IceStorm.h index ec1fe688816c..20cdee39182c 100644 --- a/slice2cpp/slice/IceStorm/IceStorm.h +++ b/slice2cpp/slice/IceStorm/IceStorm.h @@ -289,7 +289,7 @@ class ICESTORM_API TopicPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @throws IceStorm::LinkExists Raised if a link to the same topic already exists. */ - void link(const ::std::optional& linkTo, int cost, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void link(const ::std::optional& linkTo, ::std::int32_t cost, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /** * Create a link to the given topic. All events originating on this topic will also be sent to @@ -299,7 +299,7 @@ class ICESTORM_API TopicPrx : public ::Ice::Proxy * @param context The Context map to send with the invocation. * @return The future object for the invocation. */ - ::std::future linkAsync(const ::std::optional& linkTo, int cost, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future linkAsync(const ::std::optional& linkTo, ::std::int32_t cost, const ::Ice::Context& context = ::Ice::noExplicitContext)const; /** * Create a link to the given topic. All events originating on this topic will also be sent to @@ -313,14 +313,14 @@ class ICESTORM_API TopicPrx : public ::Ice::Proxy * @return A function that can be called to cancel the invocation locally. */ ::std::function - linkAsync(const ::std::optional& linkTo, int cost, + linkAsync(const ::std::optional& linkTo, ::std::int32_t cost, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_link(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, int, const ::Ice::Context&) const; + void _iceI_link(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -774,13 +774,13 @@ struct LinkInfo /** * The cost of traversing this link. */ - int cost; + ::std::int32_t cost; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&> ice_tuple() const { return std::tie(theTopic, name, cost); } @@ -1208,7 +1208,7 @@ class ICESTORM_API Topic : public virtual ::Ice::Object * @param current The Current object for the invocation. * @throws IceStorm::LinkExists Raised if a link to the same topic already exists. */ - virtual void link(::std::optional linkTo, int cost, const ::Ice::Current& current) = 0; + virtual void link(::std::optional linkTo, ::std::int32_t cost, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_link(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/slice/IceStorm/Metrics.h b/slice2cpp/slice/IceStorm/Metrics.h index 327ec7795772..24030458d93c 100644 --- a/slice2cpp/slice/IceStorm/Metrics.h +++ b/slice2cpp/slice/IceStorm/Metrics.h @@ -76,7 +76,7 @@ class ICE_CLASS(ICESTORM_API) TopicMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), published(published), forwarded(forwarded) @@ -87,7 +87,7 @@ class ICE_CLASS(ICESTORM_API) TopicMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, published, forwarded); } @@ -101,11 +101,11 @@ class ICE_CLASS(ICESTORM_API) TopicMetrics : public ::Ice::ValueHelper(id, total, current, totalLifetime, failures), queued(queued), outstanding(outstanding), @@ -152,7 +152,7 @@ class ICE_CLASS(ICESTORM_API) SubscriberMetrics : public ::Ice::ValueHelper ice_tuple() const + std::tuple ice_tuple() const { return std::tie(id, total, current, totalLifetime, failures, queued, outstanding, delivered); } @@ -166,15 +166,15 @@ class ICE_CLASS(ICESTORM_API) SubscriberMetrics : public ::Ice::ValueHelper(true, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -122,7 +122,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -134,19 +134,19 @@ Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleepAndHold(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context).get(); } ::std::future -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleepAndHold, iceP_seconds, context); } ::std::function -Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, +Test::TestIntfPrx::sleepAndHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -157,7 +157,7 @@ Test::TestIntfPrx::sleepAndHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleepAndHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -231,19 +231,19 @@ Test::TestIntfPrx::_iceI_startHeartbeatCount(const ::std::shared_ptr<::IceIntern /// \endcond void -Test::TestIntfPrx::waitForHeartbeatCount(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCount(::std::int32_t iceP_count, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForHeartbeatCount, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, +Test::TestIntfPrx::waitForHeartbeatCountAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -254,7 +254,7 @@ Test::TestIntfPrx::waitForHeartbeatCountAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_waitForHeartbeatCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -403,19 +403,19 @@ Test::RemoteObjectAdapterPrx::ice_staticId() } ::std::optional<::Test::RemoteObjectAdapterPrx> -Test::RemoteCommunicatorPrx::createObjectAdapter(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapter(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional>(true, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context).get(); } ::std::future<::std::optional<::Test::RemoteObjectAdapterPrx>> -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::optional, ::std::promise>(false, this, &RemoteCommunicatorPrx::_iceI_createObjectAdapter, iceP_acmTimeout, iceP_close, iceP_heartbeat, context); } ::std::function -Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, +Test::RemoteCommunicatorPrx::createObjectAdapterAsync(::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, ::std::function)> response, ::std::function ex, ::std::function sent, @@ -426,7 +426,7 @@ Test::RemoteCommunicatorPrx::createObjectAdapterAsync(int iceP_acmTimeout, int i /// \cond INTERNAL void -Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, int iceP_acmTimeout, int iceP_close, int iceP_heartbeat, const ::Ice::Context& context) const +Test::RemoteCommunicatorPrx::_iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, ::std::int32_t iceP_acmTimeout, ::std::int32_t iceP_close, ::std::int32_t iceP_heartbeat, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_RemoteCommunicator_createObjectAdapter_name); outAsync->invoke(iceC_Test_RemoteCommunicator_createObjectAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -506,7 +506,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleep(iceP_seconds, current); @@ -521,7 +521,7 @@ Test::TestIntf::_iceD_sleepAndHold(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->sleepAndHold(iceP_seconds, current); @@ -560,7 +560,7 @@ Test::TestIntf::_iceD_waitForHeartbeatCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); this->waitForHeartbeatCount(iceP_count, current); @@ -785,9 +785,9 @@ Test::RemoteCommunicator::_iceD_createObjectAdapter(::IceInternal::Incoming& inS { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_acmTimeout; - int iceP_close; - int iceP_heartbeat; + ::std::int32_t iceP_acmTimeout; + ::std::int32_t iceP_close; + ::std::int32_t iceP_heartbeat; istr->readAll(iceP_acmTimeout, iceP_close, iceP_heartbeat); inS.endReadParams(); ::std::optional ret = this->createObjectAdapter(iceP_acmTimeout, iceP_close, iceP_heartbeat, current); diff --git a/slice2cpp/swift/test/Ice/acm/Test.h b/slice2cpp/swift/test/Ice/acm/Test.h index b80976264c1d..546afd34fac3 100644 --- a/slice2cpp/swift/test/Ice/acm/Test.h +++ b/slice2cpp/swift/test/Ice/acm/Test.h @@ -56,34 +56,34 @@ class TestIntfPrx : public ::Ice::Proxy { public: - void sleep(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int seconds, + sleepAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void sleepAndHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleepAndHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAndHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAndHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAndHoldAsync(int seconds, + sleepAndHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleepAndHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void interruptSleep(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -114,19 +114,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_startHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void waitForHeartbeatCount(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForHeartbeatCountAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForHeartbeatCountAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForHeartbeatCountAsync(int count, + waitForHeartbeatCountAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForHeartbeatCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,19 +289,19 @@ class RemoteCommunicatorPrx : public ::Ice::Proxy createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::optional> createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::optional> createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - createObjectAdapterAsync(int acmTimeout, int close, int heartbeat, + createObjectAdapterAsync(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, int, int, int, const ::Ice::Context&) const; + void _iceI_createObjectAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -405,12 +405,12 @@ class TestIntf : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void sleep(int seconds, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleepAndHold(int seconds, const ::Ice::Current& current) = 0; + virtual void sleepAndHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleepAndHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -425,7 +425,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_startHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void waitForHeartbeatCount(int count, const ::Ice::Current& current) = 0; + virtual void waitForHeartbeatCount(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForHeartbeatCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -528,7 +528,7 @@ class RemoteCommunicator : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual ::std::optional createObjectAdapter(int acmTimeout, int close, int heartbeat, const ::Ice::Current& current) = 0; + virtual ::std::optional createObjectAdapter(::std::int32_t acmTimeout, ::std::int32_t close, ::std::int32_t heartbeat, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_createObjectAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/ami/Test.cpp b/slice2cpp/swift/test/Ice/ami/Test.cpp index 4b0805c46893..aaf0b0fcc579 100644 --- a/slice2cpp/swift/test/Ice/ami/Test.cpp +++ b/slice2cpp/swift/test/Ice/ami/Test.cpp @@ -236,30 +236,30 @@ Test::TestIntfPrx::_iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::Ou } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResult(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResult, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResult, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResult, context); } ::std::function -Test::TestIntfPrx::opWithResultAsync(::std::function response, +Test::TestIntfPrx::opWithResultAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResult, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResult_name); outAsync->invoke(iceC_Test_TestIntf_opWithResult_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -313,30 +313,30 @@ Test::TestIntfPrx::_iceI_opWithUE(const ::std::shared_ptr<::IceInternal::Outgoin } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opWithResultAndUE(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opWithResultAndUE, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opWithResultAndUE, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opWithResultAndUEAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opWithResultAndUE, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithResultAndUE, context); } ::std::function -Test::TestIntfPrx::opWithResultAndUEAsync(::std::function response, +Test::TestIntfPrx::opWithResultAndUEAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResultAndUE, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithResultAndUE, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithResultAndUE_name); outAsync->invoke(iceC_Test_TestIntf_opWithResultAndUE_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -390,9 +390,9 @@ Test::TestIntfPrx::_iceI_opBatch(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TestIntfPrx::opWithArgs(int& iceP_one, int& iceP_two, int& iceP_three, int& iceP_four, int& iceP_five, int& iceP_six, int& iceP_seven, int& iceP_eight, int& iceP_nine, int& iceP_ten, int& iceP_eleven, const ::Ice::Context& context) const +Test::TestIntfPrx::opWithArgs(::std::int32_t& iceP_one, ::std::int32_t& iceP_two, ::std::int32_t& iceP_three, ::std::int32_t& iceP_four, ::std::int32_t& iceP_five, ::std::int32_t& iceP_six, ::std::int32_t& iceP_seven, ::std::int32_t& iceP_eight, ::std::int32_t& iceP_nine, ::std::int32_t& iceP_ten, ::std::int32_t& iceP_eleven, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_opWithArgs, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_opWithArgs, context).get(); iceP_one = ::std::get<0>(_result); iceP_two = ::std::get<1>(_result); iceP_three = ::std::get<2>(_result); @@ -406,28 +406,28 @@ Test::TestIntfPrx::opWithArgs(int& iceP_one, int& iceP_two, int& iceP_three, int iceP_eleven = ::std::get<10>(_result); } -::std::future<::std::tuple> +::std::future<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>> Test::TestIntfPrx::opWithArgsAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithArgs, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_opWithArgs, context); } ::std::function -Test::TestIntfPrx::opWithArgsAsync(::std::function response, +Test::TestIntfPrx::opWithArgsAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result), ::std::get<4>(_result), ::std::get<5>(_result), ::std::get<6>(_result), ::std::get<7>(_result), ::std::get<8>(_result), ::std::get<9>(_result), ::std::get<10>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithArgs, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opWithArgs, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opWithArgs_name); outAsync->invoke(iceC_Test_TestIntf_opWithArgs_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -435,37 +435,37 @@ Test::TestIntfPrx::_iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::Outgo nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<0>(v), ::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<4>(v), ::std::get<5>(v), ::std::get<6>(v), ::std::get<7>(v), ::std::get<8>(v), ::std::get<9>(v), ::std::get<10>(v)); return v; }); } /// \endcond -int +::std::int32_t Test::TestIntfPrx::opBatchCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestIntfPrx::_iceI_opBatchCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestIntfPrx::opBatchCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_opBatchCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestIntfPrx::_iceI_opBatchCount, context); } ::std::function -Test::TestIntfPrx::opBatchCountAsync(::std::function response, +Test::TestIntfPrx::opBatchCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestIntfPrx::_iceI_opBatchCount, context); } /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_opBatchCount_name); outAsync->invoke(iceC_Test_TestIntf_opBatchCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -475,19 +475,19 @@ Test::TestIntfPrx::_iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::Out /// \endcond bool -Test::TestIntfPrx::waitForBatch(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatch(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context).get(); } ::std::future -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_waitForBatch, iceP_count, context); } ::std::function -Test::TestIntfPrx::waitForBatchAsync(int iceP_count, +Test::TestIntfPrx::waitForBatchAsync(::std::int32_t iceP_count, ::std::function response, ::std::function ex, ::std::function sent, @@ -498,7 +498,7 @@ Test::TestIntfPrx::waitForBatchAsync(int iceP_count, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_count, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_count, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestIntf_waitForBatch_name); outAsync->invoke(iceC_Test_TestIntf_waitForBatch_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -546,19 +546,19 @@ Test::TestIntfPrx::_iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAs /// \endcond void -Test::TestIntfPrx::sleep(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleep(::std::int32_t iceP_ms, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context).get(); } ::std::future -Test::TestIntfPrx::sleepAsync(int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TestIntfPrx::_iceI_sleep, iceP_ms, context); } ::std::function -Test::TestIntfPrx::sleepAsync(int iceP_ms, +Test::TestIntfPrx::sleepAsync(::std::int32_t iceP_ms, ::std::function response, ::std::function ex, ::std::function sent, @@ -569,7 +569,7 @@ Test::TestIntfPrx::sleepAsync(int iceP_ms, /// \cond INTERNAL void -Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_ms, const ::Ice::Context& context) const +Test::TestIntfPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_ms, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_TestIntf_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -846,37 +846,37 @@ Test::TestIntfControllerPrx::ice_staticId() return TestIntfController::ice_staticId(); } -int -Test::Outer::Inner::TestIntfPrx::op(int iceP_i, int& iceP_j, const ::Ice::Context& context) const +::std::int32_t +Test::Outer::Inner::TestIntfPrx::op(::std::int32_t iceP_i, ::std::int32_t& iceP_j, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(true, this, &TestIntfPrx::_iceI_op, iceP_i, context).get(); iceP_j = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); + return _makePromiseOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>, ::std::promise>(false, this, &TestIntfPrx::_iceI_op, iceP_i, context); } ::std::function -Test::Outer::Inner::TestIntfPrx::opAsync(int iceP_i, - ::std::function response, +Test::Outer::Inner::TestIntfPrx::opAsync(::std::int32_t iceP_i, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int32_t, ::std::int32_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); + return _makeLambdaOutgoing<::std::tuple<::std::int32_t, ::std::int32_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::Outer::Inner::TestIntfPrx::_iceI_op, iceP_i, context); } /// \cond INTERNAL void -Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, int iceP_i, const ::Ice::Context& context) const +Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>& outAsync, ::std::int32_t iceP_i, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Outer_Inner_TestIntf_op_name); outAsync->invoke(iceC_Test_Outer_Inner_TestIntf_op_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -887,7 +887,7 @@ Test::Outer::Inner::TestIntfPrx::_iceI_op(const ::std::shared_ptr<::IceInternal: nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int32_t, ::std::int32_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1047,7 +1047,7 @@ Test::TestIntf::_iceD_opWithResult(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResult(current); + ::std::int32_t ret = this->opWithResult(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1073,7 +1073,7 @@ Test::TestIntf::_iceD_opWithResultAndUE(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opWithResultAndUE(current); + ::std::int32_t ret = this->opWithResultAndUE(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1099,17 +1099,17 @@ Test::TestIntf::_iceD_opWithArgs(::IceInternal::Incoming& inS, const ::Ice::Curr { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int iceP_one; - int iceP_two; - int iceP_three; - int iceP_four; - int iceP_five; - int iceP_six; - int iceP_seven; - int iceP_eight; - int iceP_nine; - int iceP_ten; - int iceP_eleven; + ::std::int32_t iceP_one; + ::std::int32_t iceP_two; + ::std::int32_t iceP_three; + ::std::int32_t iceP_four; + ::std::int32_t iceP_five; + ::std::int32_t iceP_six; + ::std::int32_t iceP_seven; + ::std::int32_t iceP_eight; + ::std::int32_t iceP_nine; + ::std::int32_t iceP_ten; + ::std::int32_t iceP_eleven; this->opWithArgs(iceP_one, iceP_two, iceP_three, iceP_four, iceP_five, iceP_six, iceP_seven, iceP_eight, iceP_nine, iceP_ten, iceP_eleven, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_one, iceP_two, iceP_three, iceP_four, iceP_five, iceP_six, iceP_seven, iceP_eight, iceP_nine, iceP_ten, iceP_eleven); @@ -1124,7 +1124,7 @@ Test::TestIntf::_iceD_opBatchCount(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opBatchCount(current); + ::std::int32_t ret = this->opBatchCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -1138,7 +1138,7 @@ Test::TestIntf::_iceD_waitForBatch(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_count; + ::std::int32_t iceP_count; istr->readAll(iceP_count); inS.endReadParams(); bool ret = this->waitForBatch(iceP_count, current); @@ -1170,7 +1170,7 @@ Test::TestIntf::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_ms; + ::std::int32_t iceP_ms; istr->readAll(iceP_ms); inS.endReadParams(); this->sleep(iceP_ms, current); @@ -1488,11 +1488,11 @@ Test::Outer::Inner::TestIntf::_iceD_op(::IceInternal::Incoming& inS, const ::Ice { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_i; + ::std::int32_t iceP_i; istr->readAll(iceP_i); inS.endReadParams(); - int iceP_j; - int ret = this->op(iceP_i, iceP_j, current); + ::std::int32_t iceP_j; + ::std::int32_t ret = this->op(iceP_i, iceP_j, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_j, ret); inS.endWriteParams(); diff --git a/slice2cpp/swift/test/Ice/ami/Test.h b/slice2cpp/swift/test/Ice/ami/Test.h index bdb9a36be6b9..595bb8f7998c 100644 --- a/slice2cpp/swift/test/Ice/ami/Test.h +++ b/slice2cpp/swift/test/Ice/ami/Test.h @@ -186,18 +186,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithPayload(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::ByteSeq&, const ::Ice::Context&) const; /// \endcond - int opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResult(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAsync(::std::function response, + opWithResultAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResult(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opWithUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -214,18 +214,18 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opWithUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - int opWithResultAndUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opWithResultAndUE(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opWithResultAndUEAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opWithResultAndUEAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithResultAndUEAsync(::std::function response, + opWithResultAndUEAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opWithResultAndUE(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond void opBatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -242,47 +242,47 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_opBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void opWithArgs(int& one, int& two, int& three, int& four, int& five, int& six, int& seven, int& eight, int& nine, int& ten, int& eleven, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opWithArgs(::std::int32_t& one, ::std::int32_t& two, ::std::int32_t& three, ::std::int32_t& four, ::std::int32_t& five, ::std::int32_t& six, ::std::int32_t& seven, ::std::int32_t& eight, ::std::int32_t& nine, ::std::int32_t& ten, ::std::int32_t& eleven, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opWithArgsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>> opWithArgsAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opWithArgsAsync(::std::function response, + opWithArgsAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, const ::Ice::Context&) const; + void _iceI_opWithArgs(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t, ::std::int32_t>>>&, const ::Ice::Context&) const; /// \endcond - int opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opBatchCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opBatchCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opBatchCountAsync(::std::function response, + opBatchCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opBatchCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond - bool waitForBatch(int count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + bool waitForBatch(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future waitForBatchAsync(int count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future waitForBatchAsync(::std::int32_t count, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - waitForBatchAsync(int count, + waitForBatchAsync(::std::int32_t count, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_waitForBatch(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void close(CloseMode mode, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -300,19 +300,19 @@ class TestIntfPrx : public ::Ice::Proxy void _iceI_close(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, CloseMode, const ::Ice::Context&) const; /// \endcond - void sleep(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t ms, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int ms, + sleepAsync(::std::int32_t ms, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void startDispatch(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -538,19 +538,19 @@ class TestIntfPrx : public ::Ice::Proxy { public: - int op(int i, int& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opAsync(int i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int32_t, ::std::int32_t>> opAsync(::std::int32_t i, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opAsync(int i, - ::std::function response, + opAsync(::std::int32_t i, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, int, const ::Ice::Context&) const; + void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -733,7 +733,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithPayload(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResult(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResult(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResult(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -743,7 +743,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_opWithUE(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opWithResultAndUE(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opWithResultAndUE(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithResultAndUE(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -758,30 +758,30 @@ class TestIntf : public virtual ::Ice::Object */ struct OpWithArgsResult { - int one; - int two; - int three; - int four; - int five; - int six; - int seven; - int eight; - int nine; - int ten; - int eleven; + ::std::int32_t one; + ::std::int32_t two; + ::std::int32_t three; + ::std::int32_t four; + ::std::int32_t five; + ::std::int32_t six; + ::std::int32_t seven; + ::std::int32_t eight; + ::std::int32_t nine; + ::std::int32_t ten; + ::std::int32_t eleven; }; - virtual void opWithArgs(int& one, int& two, int& three, int& four, int& five, int& six, int& seven, int& eight, int& nine, int& ten, int& eleven, const ::Ice::Current& current) = 0; + virtual void opWithArgs(::std::int32_t& one, ::std::int32_t& two, ::std::int32_t& three, ::std::int32_t& four, ::std::int32_t& five, ::std::int32_t& six, ::std::int32_t& seven, ::std::int32_t& eight, ::std::int32_t& nine, ::std::int32_t& ten, ::std::int32_t& eleven, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opWithArgs(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opBatchCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opBatchCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opBatchCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual bool waitForBatch(int count, const ::Ice::Current& current) = 0; + virtual bool waitForBatch(::std::int32_t count, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_waitForBatch(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -791,7 +791,7 @@ class TestIntf : public virtual ::Ice::Object bool _iceD_close(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int ms, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t ms, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -925,11 +925,11 @@ class TestIntf : public virtual ::Ice::Object */ struct OpResult { - int returnValue; - int j; + ::std::int32_t returnValue; + ::std::int32_t j; }; - virtual int op(int i, int& j, const ::Ice::Current& current) = 0; + virtual ::std::int32_t op(::std::int32_t i, ::std::int32_t& j, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/defaultValue/Test.h b/slice2cpp/swift/test/Ice/defaultValue/Test.h index 708beb2e173e..0b08591d6415 100644 --- a/slice2cpp/swift/test/Ice/defaultValue/Test.h +++ b/slice2cpp/swift/test/Ice/defaultValue/Test.h @@ -67,13 +67,13 @@ enum class Color : unsigned char constexpr bool ConstBool = true; -constexpr ::Ice::Byte ConstByte = 254; +constexpr ::std::uint8_t ConstByte = 254; -constexpr short ConstShort = 16000; +constexpr ::std::int16_t ConstShort = 16000; -constexpr int ConstInt = 3; +constexpr ::std::int32_t ConstInt = 3; -constexpr long long int ConstLong = 4LL; +constexpr ::std::int64_t ConstLong = 4LL; constexpr float ConstFloat = 5.1F; @@ -93,9 +93,9 @@ constexpr ::Test::Nested::Color ConstNestedColor2 = ::Test::Nested::Color::green constexpr ::Test::Nested::Color ConstNestedColor3 = ::Test::Nested::Color::blue; -constexpr int ConstZeroI = 0; +constexpr ::std::int32_t ConstZeroI = 0; -constexpr long long int ConstZeroL = 0LL; +constexpr ::std::int64_t ConstZeroL = 0LL; constexpr float ConstZeroF = 0.0F; @@ -114,10 +114,10 @@ struct Struct1 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 254; - short s = 16000; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 254; + ::std::int16_t s = 16000; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -128,8 +128,8 @@ struct Struct1 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -139,7 +139,7 @@ struct Struct1 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -148,10 +148,10 @@ struct Struct1 struct Struct2 { bool boolTrue = ::Test::ConstBool; - ::Ice::Byte b = ::Test::ConstByte; - short s = ::Test::ConstShort; - int i = ::Test::ConstInt; - long long int l = ::Test::ConstLong; + ::std::uint8_t b = ::Test::ConstByte; + ::std::int16_t s = ::Test::ConstShort; + ::std::int32_t i = ::Test::ConstInt; + ::std::int64_t l = ::Test::ConstLong; float f = ::Test::ConstFloat; double d = ::Test::ConstDouble; ::std::string str = ::Test::ConstString; @@ -161,8 +161,8 @@ struct Struct2 ::Test::Nested::Color nc1 = ::Test::ConstNestedColor1; ::Test::Nested::Color nc2 = ::Test::ConstNestedColor2; ::Test::Nested::Color nc3 = ::Test::ConstNestedColor3; - int zeroI = ::Test::ConstZeroI; - long long int zeroL = ::Test::ConstZeroL; + ::std::int32_t zeroI = ::Test::ConstZeroI; + ::std::int64_t zeroL = ::Test::ConstZeroL; float zeroF = ::Test::ConstZeroF; float zeroDotF = ::Test::ConstZeroDotF; double zeroD = ::Test::ConstZeroD; @@ -172,7 +172,7 @@ struct Struct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -182,10 +182,10 @@ struct Struct3 { bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; @@ -196,8 +196,8 @@ struct Struct3 ::Test::Nested::Color nc2 = ::Test::Nested::Color::green; ::Test::Nested::Color nc3 = ::Test::Nested::Color::blue; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -207,7 +207,7 @@ struct Struct3 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, c1, c2, c3, nc1, nc2, nc3, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -241,7 +241,7 @@ class Base : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Base(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + Base(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -265,7 +265,7 @@ class Base : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -278,16 +278,16 @@ class Base : public ::Ice::ValueHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -314,7 +314,7 @@ class Derived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Derived(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + Derived(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, ::Test::Color c1, ::Test::Color c2, ::Test::Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : Ice::ValueHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -329,7 +329,7 @@ class Derived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } @@ -366,7 +366,7 @@ class BaseEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - BaseEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : + BaseEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD) : boolFalse(boolFalse), boolTrue(boolTrue), b(b), @@ -390,7 +390,7 @@ class BaseEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD); } @@ -403,16 +403,16 @@ class BaseEx : public ::Ice::UserExceptionHelper bool boolFalse = false; bool boolTrue = true; - ::Ice::Byte b = 1; - short s = 2; - int i = 3; - long long int l = 4LL; + ::std::uint8_t b = 1; + ::std::int16_t s = 2; + ::std::int32_t i = 3; + ::std::int64_t l = 4LL; float f = 5.1F; double d = 6.2; ::std::string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \a \a"; ::std::string noDefault; - int zeroI = 0; - long long int zeroL = 0LL; + ::std::int32_t zeroI = 0; + ::std::int64_t zeroL = 0LL; float zeroF = 0.0F; float zeroDotF = 0.0F; double zeroD = 0; @@ -436,7 +436,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - DerivedEx(bool boolFalse, bool boolTrue, ::Ice::Byte b, short s, int i, long long int l, float f, double d, const ::std::string& str, const ::std::string& noDefault, int zeroI, long long int zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : + DerivedEx(bool boolFalse, bool boolTrue, ::std::uint8_t b, ::std::int16_t s, ::std::int32_t i, ::std::int64_t l, float f, double d, const ::std::string& str, const ::std::string& noDefault, ::std::int32_t zeroI, ::std::int64_t zeroL, float zeroF, float zeroDotF, double zeroD, double zeroDotD, Color c1, Color c2, Color c3, ::Test::Nested::Color nc1, ::Test::Nested::Color nc2, ::Test::Nested::Color nc3) : ::Ice::UserExceptionHelper(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD), c1(c1), c2(c2), @@ -451,7 +451,7 @@ class DerivedEx : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(boolFalse, boolTrue, b, s, i, l, f, d, str, noDefault, zeroI, zeroL, zeroF, zeroDotF, zeroD, zeroDotD, c1, c2, c3, nc1, nc2, nc3); } diff --git a/slice2cpp/swift/test/Ice/enums/Test.h b/slice2cpp/swift/test/Ice/enums/Test.h index 2a0b5da8f18d..83abf5f1e817 100644 --- a/slice2cpp/swift/test/Ice/enums/Test.h +++ b/slice2cpp/swift/test/Ice/enums/Test.h @@ -39,21 +39,21 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -constexpr ::Ice::Byte ByteConst1 = 10; +constexpr ::std::uint8_t ByteConst1 = 10; -constexpr short ShortConst1 = 20; +constexpr ::std::int16_t ShortConst1 = 20; -constexpr int IntConst1 = 30; +constexpr ::std::int32_t IntConst1 = 30; -constexpr long long int LongConst1 = 40LL; +constexpr ::std::int64_t LongConst1 = 40LL; -constexpr ::Ice::Byte ByteConst2 = 126; +constexpr ::std::uint8_t ByteConst2 = 126; -constexpr short ShortConst2 = 32766; +constexpr ::std::int16_t ShortConst2 = 32766; -constexpr int IntConst2 = 2147483647; +constexpr ::std::int32_t IntConst2 = 2147483647; -constexpr long long int LongConst2 = 2147483646LL; +constexpr ::std::int64_t LongConst2 = 2147483646LL; enum class ByteEnum : unsigned char { diff --git a/slice2cpp/swift/test/Ice/exceptions/Test.cpp b/slice2cpp/swift/test/Ice/exceptions/Test.cpp index bd6a59049f3b..afae6a99cf6c 100644 --- a/slice2cpp/swift/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/swift/test/Ice/exceptions/Test.cpp @@ -236,19 +236,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -259,7 +259,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -285,19 +285,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -308,7 +308,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -338,19 +338,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -361,7 +361,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -387,19 +387,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -410,7 +410,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -436,19 +436,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -459,7 +459,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -485,19 +485,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -508,7 +508,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -534,19 +534,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -557,7 +557,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -583,19 +583,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -606,7 +606,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -632,19 +632,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -655,7 +655,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -667,19 +667,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -690,7 +690,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -702,19 +702,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -725,7 +725,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1188,7 +1188,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAasA(iceP_a, current); @@ -1203,7 +1203,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwAorDasAorD(iceP_a, current); @@ -1218,8 +1218,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasA(iceP_a, iceP_b, current); @@ -1234,9 +1234,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasA(iceP_a, iceP_b, iceP_c, current); @@ -1251,8 +1251,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwBasB(iceP_a, iceP_b, current); @@ -1267,9 +1267,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasB(iceP_a, iceP_b, iceP_c, current); @@ -1284,9 +1284,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwCasC(iceP_a, iceP_b, iceP_c, current); @@ -1301,8 +1301,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); this->throwModA(iceP_a, iceP_a2, current); @@ -1317,7 +1317,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); this->throwUndeclaredA(iceP_a, current); @@ -1332,8 +1332,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); this->throwUndeclaredB(iceP_a, iceP_b, current); @@ -1348,9 +1348,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); this->throwUndeclaredC(iceP_a, iceP_b, iceP_c, current); diff --git a/slice2cpp/swift/test/Ice/exceptions/Test.h b/slice2cpp/swift/test/Ice/exceptions/Test.h index 358ff5cb7363..99dc913a63cb 100644 --- a/slice2cpp/swift/test/Ice/exceptions/Test.h +++ b/slice2cpp/swift/test/Ice/exceptions/Test.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -558,7 +558,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -567,7 +567,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -578,7 +578,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -598,7 +598,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -608,7 +608,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -619,7 +619,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -635,7 +635,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -645,7 +645,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -656,7 +656,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -672,7 +672,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -681,7 +681,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -692,7 +692,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; class E : public ::Ice::UserExceptionHelper @@ -788,7 +788,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -798,7 +798,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -809,7 +809,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -903,57 +903,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasA(int a, const ::Ice::Current& current) = 0; + virtual void throwAasA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorD(int a, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorD(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasA(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasA(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasB(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModA(int a, int a2, const ::Ice::Current& current) = 0; + virtual void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredA(int a, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredA(::std::int32_t a, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredB(int a, int b, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredC(int a, int b, int c, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/exceptions/TestAMD.cpp b/slice2cpp/swift/test/Ice/exceptions/TestAMD.cpp index e498bc638b62..be39601bad32 100644 --- a/slice2cpp/swift/test/Ice/exceptions/TestAMD.cpp +++ b/slice2cpp/swift/test/Ice/exceptions/TestAMD.cpp @@ -240,19 +240,19 @@ Test::ThrowerPrx::_iceI_supportsAssertException(const ::std::shared_ptr<::IceInt /// \endcond void -Test::ThrowerPrx::throwAasA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAasAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAasA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAasAAsync(int iceP_a, +Test::ThrowerPrx::throwAasAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -263,7 +263,7 @@ Test::ThrowerPrx::throwAasAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAasA_name); outAsync->invoke(iceC_Test_Thrower_throwAasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -289,19 +289,19 @@ Test::ThrowerPrx::_iceI_throwAasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwAorDasAorD(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorD(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwAorDasAorD, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, +Test::ThrowerPrx::throwAorDasAorDAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -312,7 +312,7 @@ Test::ThrowerPrx::throwAorDasAorDAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwAorDasAorD_name); outAsync->invoke(iceC_Test_Thrower_throwAorDasAorD_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -342,19 +342,19 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::ThrowerPrx::throwBasA(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasA, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -365,7 +365,7 @@ Test::ThrowerPrx::throwBasAAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasA_name); outAsync->invoke(iceC_Test_Thrower_throwBasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -391,19 +391,19 @@ Test::ThrowerPrx::_iceI_throwBasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasA(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasA(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasA, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -414,7 +414,7 @@ Test::ThrowerPrx::throwCasAAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasA_name); outAsync->invoke(iceC_Test_Thrower_throwCasA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -440,19 +440,19 @@ Test::ThrowerPrx::_iceI_throwCasA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwBasB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwBasB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwBasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -463,7 +463,7 @@ Test::ThrowerPrx::throwBasBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwBasB_name); outAsync->invoke(iceC_Test_Thrower_throwBasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -489,19 +489,19 @@ Test::ThrowerPrx::_iceI_throwBasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasB(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasB(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasB, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -512,7 +512,7 @@ Test::ThrowerPrx::throwCasBAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasB_name); outAsync->invoke(iceC_Test_Thrower_throwCasB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -538,19 +538,19 @@ Test::ThrowerPrx::_iceI_throwCasB(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwCasC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwCasC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwCasCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -561,7 +561,7 @@ Test::ThrowerPrx::throwCasCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwCasC_name); outAsync->invoke(iceC_Test_Thrower_throwCasC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -587,19 +587,19 @@ Test::ThrowerPrx::_iceI_throwCasC(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwModA(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModA(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context).get(); } ::std::future -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwModA, iceP_a, iceP_a2, context); } ::std::function -Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, +Test::ThrowerPrx::throwModAAsync(::std::int32_t iceP_a, ::std::int32_t iceP_a2, ::std::function response, ::std::function ex, ::std::function sent, @@ -610,7 +610,7 @@ Test::ThrowerPrx::throwModAAsync(int iceP_a, int iceP_a2, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_a2, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_a2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Thrower_throwModA_name); outAsync->invoke(iceC_Test_Thrower_throwModA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -636,19 +636,19 @@ Test::ThrowerPrx::_iceI_throwModA(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond void -Test::ThrowerPrx::throwUndeclaredA(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredA(::std::int32_t iceP_a, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredA, iceP_a, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, +Test::ThrowerPrx::throwUndeclaredAAsync(::std::int32_t iceP_a, ::std::function response, ::std::function ex, ::std::function sent, @@ -659,7 +659,7 @@ Test::ThrowerPrx::throwUndeclaredAAsync(int iceP_a, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredA_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -671,19 +671,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredB(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredB(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredB, iceP_a, iceP_b, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, +Test::ThrowerPrx::throwUndeclaredBAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::function response, ::std::function ex, ::std::function sent, @@ -694,7 +694,7 @@ Test::ThrowerPrx::throwUndeclaredBAsync(int iceP_a, int iceP_b, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredB_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -706,19 +706,19 @@ Test::ThrowerPrx::_iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal:: /// \endcond void -Test::ThrowerPrx::throwUndeclaredC(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredC(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context).get(); } ::std::future -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ThrowerPrx::_iceI_throwUndeclaredC, iceP_a, iceP_b, iceP_c, context); } ::std::function -Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, +Test::ThrowerPrx::throwUndeclaredCAsync(::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, ::std::function response, ::std::function ex, ::std::function sent, @@ -729,7 +729,7 @@ Test::ThrowerPrx::throwUndeclaredCAsync(int iceP_a, int iceP_b, int iceP_c, /// \cond INTERNAL void -Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_a, int iceP_b, int iceP_c, const ::Ice::Context& context) const +Test::ThrowerPrx::_iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_a, ::std::int32_t iceP_b, ::std::int32_t iceP_c, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Thrower_throwUndeclaredC_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -1292,7 +1292,7 @@ Test::Thrower::_iceD_throwAasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1307,7 +1307,7 @@ Test::Thrower::_iceD_throwAorDasAorD(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1322,8 +1322,8 @@ Test::Thrower::_iceD_throwBasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1338,9 +1338,9 @@ Test::Thrower::_iceD_throwCasA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1355,8 +1355,8 @@ Test::Thrower::_iceD_throwBasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1371,9 +1371,9 @@ Test::Thrower::_iceD_throwCasB(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1388,9 +1388,9 @@ Test::Thrower::_iceD_throwCasC(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1405,8 +1405,8 @@ Test::Thrower::_iceD_throwModA(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_a2; + ::std::int32_t iceP_a; + ::std::int32_t iceP_a2; istr->readAll(iceP_a, iceP_a2); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1421,7 +1421,7 @@ Test::Thrower::_iceD_throwUndeclaredA(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; + ::std::int32_t iceP_a; istr->readAll(iceP_a); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1436,8 +1436,8 @@ Test::Thrower::_iceD_throwUndeclaredB(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; istr->readAll(iceP_a, iceP_b); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); @@ -1452,9 +1452,9 @@ Test::Thrower::_iceD_throwUndeclaredC(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_a; - int iceP_b; - int iceP_c; + ::std::int32_t iceP_a; + ::std::int32_t iceP_b; + ::std::int32_t iceP_c; istr->readAll(iceP_a, iceP_b, iceP_c); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); diff --git a/slice2cpp/swift/test/Ice/exceptions/TestAMD.h b/slice2cpp/swift/test/Ice/exceptions/TestAMD.h index 2a857f4fb915..4987b643b91f 100644 --- a/slice2cpp/swift/test/Ice/exceptions/TestAMD.h +++ b/slice2cpp/swift/test/Ice/exceptions/TestAMD.h @@ -162,169 +162,169 @@ class ThrowerPrx : public ::Ice::Proxy void _iceI_supportsAssertException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void throwAasA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAasA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAasAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAasAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAasAAsync(int a, + throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwAorDasAorD(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwAorDasAorD(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwAorDasAorDAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwAorDasAorDAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwAorDasAorDAsync(int a, + throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasA(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasA(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasAAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasAAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasAAsync(int a, int b, + throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasA(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasA(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasAAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasAAsync(int a, int b, int c, + throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwBasB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwBasB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwBasBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwBasBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwBasBAsync(int a, int b, + throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwBasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasB(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasB(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasBAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasBAsync(int a, int b, int c, + throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwCasC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwCasC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwCasCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwCasCAsync(int a, int b, int c, + throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwCasC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwModA(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwModA(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwModAAsync(int a, int a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwModAAsync(::std::int32_t a, ::std::int32_t a2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwModAAsync(int a, int a2, + throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwModA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredA(int a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredA(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredAAsync(int a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredAAsync(::std::int32_t a, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredAAsync(int a, + throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredA(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredB(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredB(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredBAsync(int a, int b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredBAsync(int a, int b, + throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredB(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - void throwUndeclaredC(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void throwUndeclaredC(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future throwUndeclaredCAsync(int a, int b, int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - throwUndeclaredCAsync(int a, int b, int c, + throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, int, const ::Ice::Context&) const; + void _iceI_throwUndeclaredC(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void throwLocalException(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -586,7 +586,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem) : + A(::std::int32_t aMem) : aMem(aMem) { } @@ -595,7 +595,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem); } @@ -606,7 +606,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int aMem; + ::std::int32_t aMem; }; /// \cond INTERNAL @@ -626,7 +626,7 @@ class B : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - B(int aMem, int bMem) : + B(::std::int32_t aMem, ::std::int32_t bMem) : ::Ice::UserExceptionHelper(aMem), bMem(bMem) { @@ -636,7 +636,7 @@ class B : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem); } @@ -647,7 +647,7 @@ class B : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int bMem; + ::std::int32_t bMem; }; class C : public ::Ice::UserExceptionHelper @@ -663,7 +663,7 @@ class C : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - C(int aMem, int bMem, int cMem) : + C(::std::int32_t aMem, ::std::int32_t bMem, ::std::int32_t cMem) : ::Ice::UserExceptionHelper(aMem, bMem), cMem(cMem) { @@ -673,7 +673,7 @@ class C : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, bMem, cMem); } @@ -684,7 +684,7 @@ class C : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int cMem; + ::std::int32_t cMem; }; class D : public ::Ice::UserExceptionHelper @@ -700,7 +700,7 @@ class D : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - D(int dMem) : + D(::std::int32_t dMem) : dMem(dMem) { } @@ -709,7 +709,7 @@ class D : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(dMem); } @@ -720,7 +720,7 @@ class D : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int dMem; + ::std::int32_t dMem; }; class E : public ::Ice::UserExceptionHelper @@ -816,7 +816,7 @@ class A : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - A(int aMem, int a2Mem) : + A(::std::int32_t aMem, ::std::int32_t a2Mem) : ::Ice::UserExceptionHelper(aMem), a2Mem(a2Mem) { @@ -826,7 +826,7 @@ class A : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aMem, a2Mem); } @@ -837,7 +837,7 @@ class A : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int a2Mem; + ::std::int32_t a2Mem; }; } @@ -931,57 +931,57 @@ class Thrower : public virtual ::Ice::Object bool _iceD_supportsAssertException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAasAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAasAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwAorDasAorDAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwAorDasAorDAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwAorDasAorD(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasAAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasAAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasAAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasAAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwBasBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwBasBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwBasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasBAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasBAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwCasCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwCasCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwCasC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwModAAsync(int a, int a2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwModAAsync(::std::int32_t a, ::std::int32_t a2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwModA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredAAsync(int a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredAAsync(::std::int32_t a, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredA(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredBAsync(int a, int b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredBAsync(::std::int32_t a, ::std::int32_t b, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredB(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void throwUndeclaredCAsync(int a, int b, int c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void throwUndeclaredCAsync(::std::int32_t a, ::std::int32_t b, ::std::int32_t c, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_throwUndeclaredC(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/hold/Test.cpp b/slice2cpp/swift/test/Ice/hold/Test.cpp index 9e0f56e0145d..feb78e98de3d 100644 --- a/slice2cpp/swift/test/Ice/hold/Test.cpp +++ b/slice2cpp/swift/test/Ice/hold/Test.cpp @@ -61,19 +61,19 @@ const ::std::string iceC_Test_Hold_shutdown_name = "shutdown"; } void -Test::HoldPrx::putOnHold(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHold(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context).get(); } ::std::future -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_putOnHold, iceP_seconds, context); } ::std::function -Test::HoldPrx::putOnHoldAsync(int iceP_seconds, +Test::HoldPrx::putOnHoldAsync(::std::int32_t iceP_seconds, ::std::function response, ::std::function ex, ::std::function sent, @@ -84,7 +84,7 @@ Test::HoldPrx::putOnHoldAsync(int iceP_seconds, /// \cond INTERNAL void -Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_seconds, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_seconds, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_putOnHold_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -127,19 +127,19 @@ Test::HoldPrx::_iceI_waitForHold(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::HoldPrx::setOneway(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOneway(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context).get(); } ::std::future -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_setOneway, iceP_value, iceP_expected, context); } ::std::function -Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, +Test::HoldPrx::setOnewayAsync(::std::int32_t iceP_value, ::std::int32_t iceP_expected, ::std::function response, ::std::function ex, ::std::function sent, @@ -150,7 +150,7 @@ Test::HoldPrx::setOnewayAsync(int iceP_value, int iceP_expected, /// \cond INTERNAL void -Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_expected, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_expected, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Hold_setOneway_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -161,31 +161,31 @@ Test::HoldPrx::_iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -int -Test::HoldPrx::set(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::int32_t +Test::HoldPrx::set(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context).get(); } -::std::future -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } ::std::function -Test::HoldPrx::setAsync(int iceP_value, int iceP_delay, - ::std::function response, +Test::HoldPrx::setAsync(::std::int32_t iceP_value, ::std::int32_t iceP_delay, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::HoldPrx::_iceI_set, iceP_value, iceP_delay, context); } /// \cond INTERNAL void -Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_value, int iceP_delay, const ::Ice::Context& context) const +Test::HoldPrx::_iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_value, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Hold_set_name); outAsync->invoke(iceC_Test_Hold_set_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -265,7 +265,7 @@ Test::Hold::_iceD_putOnHold(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_seconds; + ::std::int32_t iceP_seconds; istr->readAll(iceP_seconds); inS.endReadParams(); this->putOnHold(iceP_seconds, current); @@ -292,8 +292,8 @@ Test::Hold::_iceD_setOneway(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_expected; + ::std::int32_t iceP_value; + ::std::int32_t iceP_expected; istr->readAll(iceP_value, iceP_expected); inS.endReadParams(); this->setOneway(iceP_value, iceP_expected, current); @@ -308,11 +308,11 @@ Test::Hold::_iceD_set(::IceInternal::Incoming& inS, const ::Ice::Current& curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_value; - int iceP_delay; + ::std::int32_t iceP_value; + ::std::int32_t iceP_delay; istr->readAll(iceP_value, iceP_delay); inS.endReadParams(); - int ret = this->set(iceP_value, iceP_delay, current); + ::std::int32_t ret = this->set(iceP_value, iceP_delay, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/swift/test/Ice/hold/Test.h b/slice2cpp/swift/test/Ice/hold/Test.h index 6767cf758c7e..e02713366f9c 100644 --- a/slice2cpp/swift/test/Ice/hold/Test.h +++ b/slice2cpp/swift/test/Ice/hold/Test.h @@ -48,19 +48,19 @@ class HoldPrx : public ::Ice::Proxy { public: - void putOnHold(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void putOnHold(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future putOnHoldAsync(int seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future putOnHoldAsync(::std::int32_t seconds, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - putOnHoldAsync(int seconds, + putOnHoldAsync(::std::int32_t seconds, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_putOnHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void waitForHold(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -77,34 +77,34 @@ class HoldPrx : public ::Ice::Proxy void _iceI_waitForHold(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void setOneway(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setOnewayAsync(int value, int expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future setOnewayAsync(::std::int32_t value, ::std::int32_t expected, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setOnewayAsync(int value, int expected, + setOnewayAsync(::std::int32_t value, ::std::int32_t expected, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_setOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int set(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future setAsync(int value, int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> setAsync(::std::int32_t value, ::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - setAsync(int value, int delay, - ::std::function response, + setAsync(::std::int32_t value, ::std::int32_t delay, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_set(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -208,7 +208,7 @@ class Hold : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void putOnHold(int seconds, const ::Ice::Current& current) = 0; + virtual void putOnHold(::std::int32_t seconds, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_putOnHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -218,12 +218,12 @@ class Hold : public virtual ::Ice::Object bool _iceD_waitForHold(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void setOneway(int value, int expected, const ::Ice::Current& current) = 0; + virtual void setOneway(::std::int32_t value, ::std::int32_t expected, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_setOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int set(int value, int delay, const ::Ice::Current& current) = 0; + virtual ::std::int32_t set(::std::int32_t value, ::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_set(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/inheritance/Test.h b/slice2cpp/swift/test/Ice/inheritance/Test.h index e92e7a373cdc..d9165bc4e395 100644 --- a/slice2cpp/swift/test/Ice/inheritance/Test.h +++ b/slice2cpp/swift/test/Ice/inheritance/Test.h @@ -609,7 +609,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -618,7 +618,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -629,7 +629,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; /// \cond INTERNAL @@ -652,7 +652,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -662,7 +662,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -673,7 +673,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -692,7 +692,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -702,7 +702,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -713,7 +713,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -732,7 +732,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -742,7 +742,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -753,7 +753,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -777,7 +777,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -786,7 +786,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -797,7 +797,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -816,7 +816,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -826,7 +826,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -837,7 +837,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -856,7 +856,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -866,7 +866,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -877,7 +877,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -896,7 +896,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -906,7 +906,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -917,7 +917,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -941,7 +941,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -950,7 +950,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -961,7 +961,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -980,7 +980,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -990,7 +990,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1001,7 +1001,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1020,7 +1020,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1030,7 +1030,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1041,7 +1041,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1060,7 +1060,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1070,7 +1070,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1081,7 +1081,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1105,7 +1105,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1114,7 +1114,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1125,7 +1125,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1144,7 +1144,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1154,7 +1154,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1165,7 +1165,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1184,7 +1184,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1194,7 +1194,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1205,7 +1205,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1224,7 +1224,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1234,7 +1234,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1245,7 +1245,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1269,7 +1269,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1278,7 +1278,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1289,7 +1289,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1308,7 +1308,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1318,7 +1318,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1329,7 +1329,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1348,7 +1348,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1358,7 +1358,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1369,7 +1369,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1388,7 +1388,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1398,7 +1398,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1409,7 +1409,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } @@ -1433,7 +1433,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit A(int aA) : + explicit A(::std::int32_t aA) : aA(aA) { } @@ -1442,7 +1442,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA); } @@ -1453,7 +1453,7 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int aA; + ::std::int32_t aA; }; class B : public ::Ice::ValueHelper @@ -1472,7 +1472,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int aA, int bB) : + B(::std::int32_t aA, ::std::int32_t bB) : Ice::ValueHelper(aA), bB(bB) { @@ -1482,7 +1482,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB); } @@ -1493,7 +1493,7 @@ class B : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int bB; + ::std::int32_t bB; }; class C : public ::Ice::ValueHelper @@ -1512,7 +1512,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int aA, int bB, int cC) : + C(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC) : Ice::ValueHelper(aA, bB), cC(cC) { @@ -1522,7 +1522,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC); } @@ -1533,7 +1533,7 @@ class C : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int cC; + ::std::int32_t cC; }; class D : public ::Ice::ValueHelper @@ -1552,7 +1552,7 @@ class D : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - D(int aA, int bB, int cC, int dD) : + D(::std::int32_t aA, ::std::int32_t bB, ::std::int32_t cC, ::std::int32_t dD) : Ice::ValueHelper(aA, bB, cC), dD(dD) { @@ -1562,7 +1562,7 @@ class D : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(aA, bB, cC, dD); } @@ -1573,7 +1573,7 @@ class D : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int dD; + ::std::int32_t dD; }; } diff --git a/slice2cpp/swift/test/Ice/interceptor/Test.cpp b/slice2cpp/swift/test/Ice/interceptor/Test.cpp index 3a53e037d173..3d206ecd3a09 100644 --- a/slice2cpp/swift/test/Ice/interceptor/Test.cpp +++ b/slice2cpp/swift/test/Ice/interceptor/Test.cpp @@ -68,31 +68,31 @@ const ::std::string iceC_Test_MyObject_amdNotExistAdd_name = "amdNotExistAdd"; } -int -Test::MyObjectPrx::add(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::add(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_add, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_add_name); outAsync->invoke(iceC_Test_MyObject_add_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -104,31 +104,31 @@ Test::MyObjectPrx::_iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyn } /// \endcond -int -Test::MyObjectPrx::addWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::addWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::addWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::addWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_addWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_addWithRetry_name); outAsync->invoke(iceC_Test_MyObject_addWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -140,31 +140,31 @@ Test::MyObjectPrx::_iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int -Test::MyObjectPrx::badAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::badAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::badAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::badAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_badAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_badAdd_name); outAsync->invoke(iceC_Test_MyObject_badAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -189,31 +189,31 @@ Test::MyObjectPrx::_iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::notExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::notExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::notExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::notExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_notExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_notExistAdd_name); outAsync->invoke(iceC_Test_MyObject_notExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -225,31 +225,31 @@ Test::MyObjectPrx::_iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::Outg } /// \endcond -int -Test::MyObjectPrx::amdAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAdd_name); outAsync->invoke(iceC_Test_MyObject_amdAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -261,31 +261,31 @@ Test::MyObjectPrx::_iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -int -Test::MyObjectPrx::amdAddWithRetry(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdAddWithRetry(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdAddWithRetryAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdAddWithRetryAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdAddWithRetry, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdAddWithRetry_name); outAsync->invoke(iceC_Test_MyObject_amdAddWithRetry_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -297,31 +297,31 @@ Test::MyObjectPrx::_iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal:: } /// \endcond -int -Test::MyObjectPrx::amdBadAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdBadAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdBadAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdBadAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdBadAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdBadAdd_name); outAsync->invoke(iceC_Test_MyObject_amdBadAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -346,31 +346,31 @@ Test::MyObjectPrx::_iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::Outgoi } /// \endcond -int -Test::MyObjectPrx::amdNotExistAdd(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::int32_t +Test::MyObjectPrx::amdNotExistAdd(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context).get(); } -::std::future -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } ::std::function -Test::MyObjectPrx::amdNotExistAddAsync(int iceP_x, int iceP_y, - ::std::function response, +Test::MyObjectPrx::amdNotExistAddAsync(::std::int32_t iceP_x, ::std::int32_t iceP_y, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyObjectPrx::_iceI_amdNotExistAdd, iceP_x, iceP_y, context); } /// \cond INTERNAL void -Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_x, int iceP_y, const ::Ice::Context& context) const +Test::MyObjectPrx::_iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_x, ::std::int32_t iceP_y, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyObject_amdNotExistAdd_name); outAsync->invoke(iceC_Test_MyObject_amdNotExistAdd_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -430,11 +430,11 @@ Test::MyObject::_iceD_add(::IceInternal::Incoming& inS, const ::Ice::Current& cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->add(iceP_x, iceP_y, current); + ::std::int32_t ret = this->add(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -448,11 +448,11 @@ Test::MyObject::_iceD_addWithRetry(::IceInternal::Incoming& inS, const ::Ice::Cu { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->addWithRetry(iceP_x, iceP_y, current); + ::std::int32_t ret = this->addWithRetry(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -466,11 +466,11 @@ Test::MyObject::_iceD_badAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->badAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->badAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -484,11 +484,11 @@ Test::MyObject::_iceD_notExistAdd(::IceInternal::Incoming& inS, const ::Ice::Cur { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); - int ret = this->notExistAdd(iceP_x, iceP_y, current); + ::std::int32_t ret = this->notExistAdd(iceP_x, iceP_y, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -502,12 +502,12 @@ Test::MyObject::_iceD_amdAdd(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -525,12 +525,12 @@ Test::MyObject::_iceD_amdAddWithRetry(::IceInternal::Incoming& inS, const ::Ice: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -548,12 +548,12 @@ Test::MyObject::_iceD_amdBadAdd(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -571,12 +571,12 @@ Test::MyObject::_iceD_amdNotExistAdd(::IceInternal::Incoming& inS, const ::Ice:: { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_x; - int iceP_y; + ::std::int32_t iceP_x; + ::std::int32_t iceP_y; istr->readAll(iceP_x, iceP_y); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/swift/test/Ice/interceptor/Test.h b/slice2cpp/swift/test/Ice/interceptor/Test.h index b467ff4cbcfe..f4809553a128 100644 --- a/slice2cpp/swift/test/Ice/interceptor/Test.h +++ b/slice2cpp/swift/test/Ice/interceptor/Test.h @@ -48,124 +48,124 @@ class MyObjectPrx : public ::Ice::Proxy { public: - int add(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addAsync(int x, int y, - ::std::function response, + addAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_add(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int addWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future addWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> addWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - addWithRetryAsync(int x, int y, - ::std::function response, + addWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_addWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int badAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future badAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> badAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - badAddAsync(int x, int y, - ::std::function response, + badAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_badAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int notExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future notExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> notExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - notExistAddAsync(int x, int y, - ::std::function response, + notExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_notExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddAsync(int x, int y, - ::std::function response, + amdAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdAddWithRetry(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdAddWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdAddWithRetryAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdAddWithRetryAsync(int x, int y, - ::std::function response, + amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdAddWithRetry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdBadAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdBadAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdBadAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdBadAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdBadAddAsync(int x, int y, - ::std::function response, + amdBadAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdBadAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - int amdNotExistAdd(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t amdNotExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future amdNotExistAddAsync(int x, int y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - amdNotExistAddAsync(int x, int y, - ::std::function response, + amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, int, const ::Ice::Context&) const; + void _iceI_amdNotExistAdd(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -300,42 +300,42 @@ class MyObject : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual int add(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t add(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_add(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int addWithRetry(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t addWithRetry(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_addWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int badAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t badAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_badAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int notExistAdd(int x, int y, const ::Ice::Current& current) = 0; + virtual ::std::int32_t notExistAdd(::std::int32_t x, ::std::int32_t y, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_notExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdAddWithRetryAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdAddWithRetryAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdAddWithRetry(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdBadAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdBadAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdBadAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void amdNotExistAddAsync(int x, int y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void amdNotExistAddAsync(::std::int32_t x, ::std::int32_t y, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_amdNotExistAdd(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/location/Test.cpp b/slice2cpp/swift/test/Ice/location/Test.cpp index 38e4725febdb..19b040f9bad7 100644 --- a/slice2cpp/swift/test/Ice/location/Test.cpp +++ b/slice2cpp/swift/test/Ice/location/Test.cpp @@ -169,30 +169,30 @@ Test::TestLocatorRegistryPrx::ice_staticId() return TestLocatorRegistry::ice_staticId(); } -int +::std::int32_t Test::TestLocatorPrx::getRequestCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &TestLocatorPrx::_iceI_getRequestCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::TestLocatorPrx::getRequestCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &TestLocatorPrx::_iceI_getRequestCount, context); } ::std::function -Test::TestLocatorPrx::getRequestCountAsync(::std::function response, +Test::TestLocatorPrx::getRequestCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::TestLocatorPrx::_iceI_getRequestCount, context); } /// \cond INTERNAL void -Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::TestLocatorPrx::_iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_TestLocator_getRequestCount_name); outAsync->invoke(iceC_Test_TestLocator_getRequestCount_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -568,7 +568,7 @@ Test::TestLocator::_iceD_getRequestCount(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); inS.readEmptyParams(); - int ret = this->getRequestCount(current); + ::std::int32_t ret = this->getRequestCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/swift/test/Ice/location/Test.h b/slice2cpp/swift/test/Ice/location/Test.h index 391ebb95092d..d80dfdf46a3a 100644 --- a/slice2cpp/swift/test/Ice/location/Test.h +++ b/slice2cpp/swift/test/Ice/location/Test.h @@ -141,18 +141,18 @@ class TestLocatorPrx : public ::Ice::Proxy { public: - int getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t getRequestCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> getRequestCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - getRequestCountAsync(::std::function response, + getRequestCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_getRequestCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond /** @@ -549,7 +549,7 @@ class TestLocator : public virtual ::Ice::Locator */ static const ::std::string& ice_staticId(); - virtual int getRequestCount(const ::Ice::Current& current) const = 0; + virtual ::std::int32_t getRequestCount(const ::Ice::Current& current) const = 0; /// \cond INTERNAL bool _iceD_getRequestCount(::IceInternal::Incoming&, const ::Ice::Current&) const; /// \endcond diff --git a/slice2cpp/swift/test/Ice/objects/Test.h b/slice2cpp/swift/test/Ice/objects/Test.h index b305e1f27496..b75306836103 100644 --- a/slice2cpp/swift/test/Ice/objects/Test.h +++ b/slice2cpp/swift/test/Ice/objects/Test.h @@ -102,7 +102,7 @@ namespace Test using BaseSeq = ::std::vector<::std::shared_ptr>; -constexpr int CompactExtId = 789; +constexpr ::std::int32_t CompactExtId = 789; namespace Inner { @@ -120,9 +120,9 @@ using ValueMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Value>>; using LMap = ::std::map>; -using DOneMember = ::std::map>; +using DOneMember = ::std::map<::std::int32_t, ::std::shared_ptr>; -using DTwoMembers = ::std::map>; +using DTwoMembers = ::std::map<::std::int32_t, ::std::shared_ptr>; } @@ -921,14 +921,14 @@ struct S struct StructKey { - int i; + ::std::int32_t i; ::std::string s; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1211,7 +1211,7 @@ class E : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - E(int i, const ::std::string& s) : + E(::std::int32_t i, const ::std::string& s) : i(i), s(s) { @@ -1221,7 +1221,7 @@ class E : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, s); } @@ -1234,7 +1234,7 @@ class E : public ::Ice::ValueHelper protected: - int i; + ::std::int32_t i; ::std::string s; template diff --git a/slice2cpp/swift/test/Ice/operations/Test.cpp b/slice2cpp/swift/test/Ice/operations/Test.cpp index 9d65f884726e..23f7359ef025 100644 --- a/slice2cpp/swift/test/Ice/operations/Test.cpp +++ b/slice2cpp/swift/test/Ice/operations/Test.cpp @@ -466,37 +466,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -507,7 +507,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -562,39 +562,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,7 +605,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2563,30 +2563,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2724,31 +2724,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2760,31 +2760,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2796,31 +2796,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2832,31 +2832,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3644,12 +3644,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); - ::Ice::Byte iceP_p3; - ::Ice::Byte ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); + ::std::uint8_t iceP_p3; + ::std::uint8_t ret = this->opByte(iceP_p1, iceP_p2, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p3, ret); inS.endWriteParams(); @@ -3682,15 +3682,15 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); - short iceP_p4; - int iceP_p5; - long long int iceP_p6; - long long int ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); + ::std::int16_t iceP_p4; + ::std::int32_t iceP_p5; + ::std::int64_t iceP_p6; + ::std::int64_t ret = this->opShortIntLong(iceP_p1, iceP_p2, iceP_p3, iceP_p4, iceP_p5, iceP_p6, current); auto ostr = inS.startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); inS.endWriteParams(); @@ -4485,7 +4485,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); - int ret = this->opByteSOnewayCallCount(current); + ::std::int32_t ret = this->opByteSOnewayCallCount(current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4553,10 +4553,10 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); - ::Ice::Byte ret = this->opByte1(iceP_opByte1, current); + ::std::uint8_t ret = this->opByte1(iceP_opByte1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4570,10 +4570,10 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); - short ret = this->opShort1(iceP_opShort1, current); + ::std::int16_t ret = this->opShort1(iceP_opShort1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4587,10 +4587,10 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); - int ret = this->opInt1(iceP_opInt1, current); + ::std::int32_t ret = this->opInt1(iceP_opInt1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -4604,10 +4604,10 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); - long long int ret = this->opLong1(iceP_opLong1, current); + ::std::int64_t ret = this->opLong1(iceP_opLong1, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); diff --git a/slice2cpp/swift/test/Ice/operations/Test.h b/slice2cpp/swift/test/Ice/operations/Test.h index 68a534019db2..73a1bff39bf6 100644 --- a/slice2cpp/swift/test/Ice/operations/Test.h +++ b/slice2cpp/swift/test/Ice/operations/Test.h @@ -66,15 +66,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -110,11 +110,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -138,15 +138,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -384,19 +384,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -414,19 +414,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1044,18 +1044,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1115,64 +1115,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1655,14 +1655,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1837,11 +1837,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1865,13 +1865,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2440,7 +2440,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opByteSOnewayCallCount(const ::Ice::Current& current) = 0; + virtual ::std::int32_t opByteSOnewayCallCount(const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2465,22 +2465,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Current& current) = 0; + virtual ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual short opShort1(short opShort1, const ::Ice::Current& current) = 0; + virtual ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opInt1(int opInt1, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual long long int opLong1(long long int opLong1, const ::Ice::Current& current) = 0; + virtual ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/operations/TestAMD.cpp b/slice2cpp/swift/test/Ice/operations/TestAMD.cpp index c86848d69866..5dbd2877be1a 100644 --- a/slice2cpp/swift/test/Ice/operations/TestAMD.cpp +++ b/slice2cpp/swift/test/Ice/operations/TestAMD.cpp @@ -379,37 +379,37 @@ Test::MyClassPrx::_iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, ::Ice::Byte& iceP_p3, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, ::std::uint8_t& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(true, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makePromiseOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } ::std::function -Test::MyClassPrx::opByteAsync(::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, - ::std::function response, +Test::MyClassPrx::opByteAsync(::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple<::Ice::Byte, ::Ice::Byte>&& _result) + auto _responseCb = [response](::std::tuple<::std::uint8_t, ::std::uint8_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple<::Ice::Byte, ::Ice::Byte>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); + return _makeLambdaOutgoing<::std::tuple<::std::uint8_t, ::std::uint8_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte, iceP_p1, iceP_p2, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>& outAsync, ::Ice::Byte iceP_p1, ::Ice::Byte iceP_p2, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>& outAsync, ::std::uint8_t iceP_p1, ::std::uint8_t iceP_p2, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte_name); outAsync->invoke(iceC_Test_MyClass_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,7 +420,7 @@ Test::MyClassPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple<::Ice::Byte, ::Ice::Byte> v; + ::std::tuple<::std::uint8_t, ::std::uint8_t> v; istr->readAll(::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -475,39 +475,39 @@ Test::MyClassPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opShortIntLong(short iceP_p1, int iceP_p2, long long int iceP_p3, short& iceP_p4, int& iceP_p5, long long int& iceP_p6, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opShortIntLong(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, ::std::int16_t& iceP_p4, ::std::int32_t& iceP_p5, ::std::int64_t& iceP_p6, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(true, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context).get(); iceP_p4 = ::std::get<1>(_result); iceP_p5 = ::std::get<2>(_result); iceP_p6 = ::std::get<3>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple> -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makePromiseOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>, ::std::promise>(false, this, &MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } ::std::function -Test::MyClassPrx::opShortIntLongAsync(short iceP_p1, int iceP_p2, long long int iceP_p3, - ::std::function response, +Test::MyClassPrx::opShortIntLongAsync(::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple&& _result) + auto _responseCb = [response](::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result), ::std::get<2>(_result), ::std::get<3>(_result)); }; - return _makeLambdaOutgoing<::std::tuple>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); + return _makeLambdaOutgoing<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShortIntLong, iceP_p1, iceP_p2, iceP_p3, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>& outAsync, short iceP_p1, int iceP_p2, long long int iceP_p3, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>& outAsync, ::std::int16_t iceP_p1, ::std::int32_t iceP_p2, ::std::int64_t iceP_p3, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShortIntLong_name); outAsync->invoke(iceC_Test_MyClass_opShortIntLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -518,7 +518,7 @@ Test::MyClassPrx::_iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::Ou nullptr, [](::Ice::InputStream* istr) { - ::std::tuple v; + ::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t> v; istr->readAll(::std::get<1>(v), ::std::get<2>(v), ::std::get<3>(v), ::std::get<0>(v)); return v; }); @@ -2476,30 +2476,30 @@ Test::MyClassPrx::_iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -int +::std::int32_t Test::MyClassPrx::opByteSOnewayCallCount(const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context).get(); } -::std::future +::std::future<::std::int32_t> Test::MyClassPrx::opByteSOnewayCallCountAsync(const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByteSOnewayCallCount, context); } ::std::function -Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, +Test::MyClassPrx::opByteSOnewayCallCountAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByteSOnewayCallCount, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByteSOnewayCallCount_name); outAsync->invoke(iceC_Test_MyClass_opByteSOnewayCallCount_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2637,31 +2637,31 @@ Test::MyClassPrx::_iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::Out } /// \endcond -::Ice::Byte -Test::MyClassPrx::opByte1(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::uint8_t +Test::MyClassPrx::opByte1(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); + return _makePromiseOutgoing<::std::uint8_t>(true, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context).get(); } -::std::future<::Ice::Byte> -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +::std::future<::std::uint8_t> +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::Ice::Byte, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makePromiseOutgoing<::std::uint8_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } ::std::function -Test::MyClassPrx::opByte1Async(::Ice::Byte iceP_opByte1, - ::std::function response, +Test::MyClassPrx::opByte1Async(::std::uint8_t iceP_opByte1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing<::Ice::Byte>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); + return _makeLambdaOutgoing<::std::uint8_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opByte1, iceP_opByte1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>& outAsync, ::Ice::Byte iceP_opByte1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>& outAsync, ::std::uint8_t iceP_opByte1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opByte1_name); outAsync->invoke(iceC_Test_MyClass_opByte1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2673,31 +2673,31 @@ Test::MyClassPrx::_iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingA } /// \endcond -short -Test::MyClassPrx::opShort1(short iceP_opShort1, const ::Ice::Context& context) const +::std::int16_t +Test::MyClassPrx::opShort1(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); + return _makePromiseOutgoing<::std::int16_t>(true, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context).get(); } -::std::future -Test::MyClassPrx::opShort1Async(short iceP_opShort1, const ::Ice::Context& context) const +::std::future<::std::int16_t> +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makePromiseOutgoing<::std::int16_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } ::std::function -Test::MyClassPrx::opShort1Async(short iceP_opShort1, - ::std::function response, +Test::MyClassPrx::opShort1Async(::std::int16_t iceP_opShort1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); + return _makeLambdaOutgoing<::std::int16_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opShort1, iceP_opShort1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, short iceP_opShort1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>& outAsync, ::std::int16_t iceP_opShort1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opShort1_name); outAsync->invoke(iceC_Test_MyClass_opShort1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2709,31 +2709,31 @@ Test::MyClassPrx::_iceI_opShort1(const ::std::shared_ptr<::IceInternal::Outgoing } /// \endcond -int -Test::MyClassPrx::opInt1(int iceP_opInt1, const ::Ice::Context& context) const +::std::int32_t +Test::MyClassPrx::opInt1(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context).get(); } -::std::future -Test::MyClassPrx::opInt1Async(int iceP_opInt1, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } ::std::function -Test::MyClassPrx::opInt1Async(int iceP_opInt1, - ::std::function response, +Test::MyClassPrx::opInt1Async(::std::int32_t iceP_opInt1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opInt1, iceP_opInt1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_opInt1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_opInt1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opInt1_name); outAsync->invoke(iceC_Test_MyClass_opInt1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -2745,31 +2745,31 @@ Test::MyClassPrx::_iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -long long int -Test::MyClassPrx::opLong1(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::int64_t +Test::MyClassPrx::opLong1(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); + return _makePromiseOutgoing<::std::int64_t>(true, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context).get(); } -::std::future -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, const ::Ice::Context& context) const +::std::future<::std::int64_t> +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makePromiseOutgoing<::std::int64_t, ::std::promise>(false, this, &MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } ::std::function -Test::MyClassPrx::opLong1Async(long long int iceP_opLong1, - ::std::function response, +Test::MyClassPrx::opLong1Async(::std::int64_t iceP_opLong1, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); + return _makeLambdaOutgoing<::std::int64_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::MyClassPrx::_iceI_opLong1, iceP_opLong1, context); } /// \cond INTERNAL void -Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, long long int iceP_opLong1, const ::Ice::Context& context) const +Test::MyClassPrx::_iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>& outAsync, ::std::int64_t iceP_opLong1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_MyClass_opLong1_name); outAsync->invoke(iceC_Test_MyClass_opLong1_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3545,12 +3545,12 @@ Test::MyClass::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_p1; - ::Ice::Byte iceP_p2; + ::std::uint8_t iceP_p1; + ::std::uint8_t iceP_p2; istr->readAll(iceP_p1, iceP_p2); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret, ::Ice::Byte iceP_p3) + auto responseCB = [inA](::std::uint8_t ret, ::std::uint8_t iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p3, ret); @@ -3591,13 +3591,13 @@ Test::MyClass::_iceD_opShortIntLong(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_p1; - int iceP_p2; - long long int iceP_p3; + ::std::int16_t iceP_p1; + ::std::int32_t iceP_p2; + ::std::int64_t iceP_p3; istr->readAll(iceP_p1, iceP_p2, iceP_p3); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret, short iceP_p4, int iceP_p5, long long int iceP_p6) + auto responseCB = [inA](::std::int64_t ret, ::std::int16_t iceP_p4, ::std::int32_t iceP_p5, ::std::int64_t iceP_p6) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_p4, iceP_p5, iceP_p6, ret); @@ -4550,7 +4550,7 @@ Test::MyClass::_iceD_opByteSOnewayCallCount(::IceInternal::Incoming& inS, const _iceCheckMode(::Ice::OperationMode::Normal, current.mode); inS.readEmptyParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4627,11 +4627,11 @@ Test::MyClass::_iceD_opByte1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - ::Ice::Byte iceP_opByte1; + ::std::uint8_t iceP_opByte1; istr->readAll(iceP_opByte1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](::Ice::Byte ret) + auto responseCB = [inA](::std::uint8_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4649,11 +4649,11 @@ Test::MyClass::_iceD_opShort1(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - short iceP_opShort1; + ::std::int16_t iceP_opShort1; istr->readAll(iceP_opShort1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](short ret) + auto responseCB = [inA](::std::int16_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4671,11 +4671,11 @@ Test::MyClass::_iceD_opInt1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_opInt1; + ::std::int32_t iceP_opInt1; istr->readAll(iceP_opInt1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int ret) + auto responseCB = [inA](::std::int32_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); @@ -4693,11 +4693,11 @@ Test::MyClass::_iceD_opLong1(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - long long int iceP_opLong1; + ::std::int64_t iceP_opLong1; istr->readAll(iceP_opLong1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](long long int ret) + auto responseCB = [inA](::std::int64_t ret) { auto ostr = inA->startWriteParams(); ostr->writeAll(ret); diff --git a/slice2cpp/swift/test/Ice/operations/TestAMD.h b/slice2cpp/swift/test/Ice/operations/TestAMD.h index 560ff82949d4..eaf05ac489bc 100644 --- a/slice2cpp/swift/test/Ice/operations/TestAMD.h +++ b/slice2cpp/swift/test/Ice/operations/TestAMD.h @@ -56,15 +56,15 @@ enum class MyEnum : unsigned char enum3 }; -using ByteS = ::std::vector<::Ice::Byte>; +using ByteS = ::std::vector<::std::uint8_t>; using BoolS = ::std::vector; -using ShortS = ::std::vector; +using ShortS = ::std::vector<::std::int16_t>; -using IntS = ::std::vector; +using IntS = ::std::vector<::std::int32_t>; -using LongS = ::std::vector; +using LongS = ::std::vector<::std::int64_t>; using FloatS = ::std::vector; @@ -98,11 +98,11 @@ using MyClassSS = ::std::vector; using StringSSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -126,15 +126,15 @@ using MyEnumStringDS = ::std::vector; using MyStructMyEnumDS = ::std::vector; -using ByteByteSD = ::std::map<::Ice::Byte, ByteS>; +using ByteByteSD = ::std::map<::std::uint8_t, ByteS>; using BoolBoolSD = ::std::map; -using ShortShortSD = ::std::map; +using ShortShortSD = ::std::map<::std::int16_t, ShortS>; -using IntIntSD = ::std::map; +using IntIntSD = ::std::map<::std::int32_t, IntS>; -using LongLongSD = ::std::map; +using LongLongSD = ::std::map<::std::int64_t, LongS>; using StringFloatSD = ::std::map<::std::string, FloatS>; @@ -279,19 +279,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opVoid(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte(::Ice::Byte p1, ::Ice::Byte p2, ::Ice::Byte& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte(::std::uint8_t p1, ::std::uint8_t p2, ::std::uint8_t& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple<::Ice::Byte, ::Ice::Byte>> opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::uint8_t, ::std::uint8_t>> opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, - ::std::function response, + opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::Ice::Byte, ::Ice::Byte>>>&, ::Ice::Byte, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::uint8_t, ::std::uint8_t>>>&, ::std::uint8_t, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond bool opBool(bool p1, bool p2, bool& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -309,19 +309,19 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, bool, bool, const ::Ice::Context&) const; /// \endcond - long long int opShortIntLong(short p1, int p2, long long int p3, short& p4, int& p5, long long int& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opShortIntLong(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::int16_t& p4, ::std::int32_t& p5, ::std::int64_t& p6, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple> opShortIntLongAsync(short p1, int p2, long long int p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>> opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortIntLongAsync(short p1, int p2, long long int p3, - ::std::function response, + opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>>&, short, int, long long int, const ::Ice::Context&) const; + void _iceI_opShortIntLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int64_t, ::std::int16_t, ::std::int32_t, ::std::int64_t>>>&, ::std::int16_t, ::std::int32_t, ::std::int64_t, const ::Ice::Context&) const; /// \endcond double opFloatDouble(float p1, double p2, float& p3, double& p4, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -939,18 +939,18 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opByteSOneway(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteS&, const ::Ice::Context&) const; /// \endcond - int opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opByteSOnewayCallCount(const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opByteSOnewayCallCountAsync(const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSOnewayCallCountAsync(::std::function response, + opByteSOnewayCallCountAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + void _iceI_opByteSOnewayCallCount(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, const ::Ice::Context&) const; /// \endcond ::Ice::Context opContext(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1010,64 +1010,64 @@ class MyClassPrx : public ::Ice::Proxy void _iceI_opNonmutating(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - ::Ice::Byte opByte1(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::uint8_t opByte1(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::Ice::Byte> opByte1Async(::Ice::Byte opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::uint8_t> opByte1Async(::std::uint8_t opByte1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByte1Async(::Ice::Byte opByte1, - ::std::function response, + opByte1Async(::std::uint8_t opByte1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Byte>>&, ::Ice::Byte, const ::Ice::Context&) const; + void _iceI_opByte1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::uint8_t>>&, ::std::uint8_t, const ::Ice::Context&) const; /// \endcond - short opShort1(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int16_t opShort1(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opShort1Async(short opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int16_t> opShort1Async(::std::int16_t opShort1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShort1Async(short opShort1, - ::std::function response, + opShort1Async(::std::int16_t opShort1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, short, const ::Ice::Context&) const; + void _iceI_opShort1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int16_t>>&, ::std::int16_t, const ::Ice::Context&) const; /// \endcond - int opInt1(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opInt1(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opInt1Async(int opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opInt1Async(::std::int32_t opInt1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opInt1Async(int opInt1, - ::std::function response, + opInt1Async(::std::int32_t opInt1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opInt1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond - long long int opLong1(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int64_t opLong1(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opLong1Async(long long int opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int64_t> opLong1Async(::std::int64_t opLong1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLong1Async(long long int opLong1, - ::std::function response, + opLong1Async(::std::int64_t opLong1, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, long long int, const ::Ice::Context&) const; + void _iceI_opLong1(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int64_t>>&, ::std::int64_t, const ::Ice::Context&) const; /// \endcond float opFloat1(float opFloat1, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1480,14 +1480,14 @@ struct Structure struct MyStruct { - int i; - int j; + ::std::int32_t i; + ::std::int32_t j; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i, j); } @@ -1627,11 +1627,11 @@ class MyClass : public virtual ::Ice::Object */ struct OpByteResult { - ::Ice::Byte returnValue; - ::Ice::Byte p3; + ::std::uint8_t returnValue; + ::std::uint8_t p3; }; - virtual void opByteAsync(::Ice::Byte p1, ::Ice::Byte p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(::std::uint8_t p1, ::std::uint8_t p2, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1655,13 +1655,13 @@ class MyClass : public virtual ::Ice::Object */ struct OpShortIntLongResult { - long long int returnValue; - short p4; - int p5; - long long int p6; + ::std::int64_t returnValue; + ::std::int16_t p4; + ::std::int32_t p5; + ::std::int64_t p6; }; - virtual void opShortIntLongAsync(short p1, int p2, long long int p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortIntLongAsync(::std::int16_t p1, ::std::int32_t p2, ::std::int64_t p3, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortIntLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2230,7 +2230,7 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opByteSOneway(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteSOnewayCallCountAsync(::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSOnewayCallCount(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2255,22 +2255,22 @@ class MyClass : public virtual ::Ice::Object bool _iceD_opNonmutating(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opByte1Async(::Ice::Byte opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByte1Async(::std::uint8_t opByte1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opShort1Async(short opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShort1Async(::std::int16_t opShort1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opInt1Async(int opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opInt1Async(::std::int32_t opInt1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opLong1Async(long long int opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLong1Async(::std::int64_t opLong1, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong1(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/optional/Test.cpp b/slice2cpp/swift/test/Ice/optional/Test.cpp index 5d5b3cf90b7f..3c14e32d1771 100644 --- a/slice2cpp/swift/test/Ice/optional/Test.cpp +++ b/slice2cpp/swift/test/Ice/optional/Test.cpp @@ -322,19 +322,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -345,7 +345,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -371,19 +371,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -394,7 +394,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -420,19 +420,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -443,7 +443,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -468,37 +468,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -509,7 +509,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -564,37 +564,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -605,44 +605,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -653,44 +653,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -701,7 +701,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -1214,7 +1214,7 @@ Test::InitialPrx::_iceI_opMyInterfaceProxy(const ::std::shared_ptr<::IceInternal /// \endcond std::optional<::Test::ByteSeq> -Test::InitialPrx::opByteSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opByteSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opByteSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1222,14 +1222,14 @@ Test::InitialPrx::opByteSeq(const std::optional<::std::pair, std::optional<::Test::ByteSeq>>> -Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opByteSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1241,8 +1241,8 @@ Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1268,7 +1268,7 @@ Test::InitialPrx::opByteSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByteSeq_name); outAsync->invoke(iceC_Test_Initial_opByteSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1360,7 +1360,7 @@ Test::InitialPrx::_iceI_opBoolSeq(const ::std::shared_ptr<::IceInternal::Outgoin /// \endcond std::optional<::Test::ShortSeq> -Test::InitialPrx::opShortSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opShortSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShortSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1368,14 +1368,14 @@ Test::InitialPrx::opShortSeq(const std::optional<::std::pair, std::optional<::Test::ShortSeq>>> -Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShortSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1387,8 +1387,8 @@ Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1414,7 +1414,7 @@ Test::InitialPrx::opShortSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShortSeq_name); outAsync->invoke(iceC_Test_Initial_opShortSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1433,7 +1433,7 @@ Test::InitialPrx::_iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::Outgoi /// \endcond std::optional<::Test::IntSeq> -Test::InitialPrx::opIntSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opIntSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opIntSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1441,14 +1441,14 @@ Test::InitialPrx::opIntSeq(const std::optional<::std::pair, std::optional<::Test::IntSeq>>> -Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opIntSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1460,8 +1460,8 @@ Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1487,7 +1487,7 @@ Test::InitialPrx::opIntSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opIntSeq_name); outAsync->invoke(iceC_Test_Initial_opIntSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -1506,7 +1506,7 @@ Test::InitialPrx::_iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond std::optional<::Test::LongSeq> -Test::InitialPrx::opLongSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +Test::InitialPrx::opLongSeq(const std::optional<::std::pair>& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const { auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLongSeq, iceP_p1, context).get(); iceP_p3 = ::std::move(::std::get<1>(_result)); @@ -1514,14 +1514,14 @@ Test::InitialPrx::opLongSeq(const std::optional<::std::pair, std::optional<::Test::LongSeq>>> -Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLongSeq, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, - ::std::function>, std::optional<::std::pair>)> response, +Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair>& iceP_p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const @@ -1533,8 +1533,8 @@ Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pairstartEncapsulation(); - std::optional<::std::pair> iceP_p3; - std::optional<::std::pair> ret; + std::optional<::std::pair> iceP_p3; + std::optional<::std::pair> ret; istr->readAll({1, 3}, ret, iceP_p3); istr->endEncapsulation(); try @@ -1560,7 +1560,7 @@ Test::InitialPrx::opLongSeqAsync(const std::optional<::std::pair, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional<::std::pair>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLongSeq_name); outAsync->invoke(iceC_Test_Initial_opLongSeq_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -3429,7 +3429,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3446,7 +3446,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3463,7 +3463,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3480,11 +3480,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional<::Ice::Byte> iceP_p3; - std::optional<::Ice::Byte> ret = this->opByte(iceP_p1, iceP_p3, current); + std::optional<::std::uint8_t> iceP_p3; + std::optional<::std::uint8_t> ret = this->opByte(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3516,11 +3516,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opShort(iceP_p1, iceP_p3, current); + std::optional<::std::int16_t> iceP_p3; + std::optional<::std::int16_t> ret = this->opShort(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3534,11 +3534,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opInt(iceP_p1, iceP_p3, current); + std::optional<::std::int32_t> iceP_p3; + std::optional<::std::int32_t> ret = this->opInt(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); inS.endWriteParams(); @@ -3552,11 +3552,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); - std::optional iceP_p3; - std::optional ret = this->opLong(iceP_p1, iceP_p3, current); + std::optional<::std::int64_t> iceP_p3; + std::optional<::std::int64_t> ret = this->opLong(iceP_p1, iceP_p3, current); auto ostr = inS.startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); inS.endWriteParams(); @@ -3750,7 +3750,7 @@ Test::Initial::_iceD_opByteSeq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; @@ -3786,7 +3786,7 @@ Test::Initial::_iceD_opShortSeq(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; @@ -3804,7 +3804,7 @@ Test::Initial::_iceD_opIntSeq(::IceInternal::Incoming& inS, const ::Ice::Current { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; @@ -3822,7 +3822,7 @@ Test::Initial::_iceD_opLongSeq(::IceInternal::Incoming& inS, const ::Ice::Curren { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::std::pair> iceP_p1; + std::optional<::std::pair> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); std::optional iceP_p3; diff --git a/slice2cpp/swift/test/Ice/optional/Test.h b/slice2cpp/swift/test/Ice/optional/Test.h index d7327efa1635..50394461dadc 100644 --- a/slice2cpp/swift/test/Ice/optional/Test.h +++ b/slice2cpp/swift/test/Ice/optional/Test.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,23 +97,23 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; -using IntStringDict = ::std::map; +using IntStringDict = ::std::map<::std::int32_t, ::std::string>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -221,64 +221,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -296,49 +296,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -491,19 +491,19 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opMyInterfaceProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple>, std::optional<::std::optional>>>>&, const std::optional<::std::optional>&, const ::Ice::Context&) const; /// \endcond - std::optional opByteSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opByteSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opByteSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opByteSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opByteSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond std::optional opBoolSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -521,49 +521,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBoolSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opShortSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opShortSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opShortSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opShortSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opShortSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opIntSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opIntSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opIntSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opIntSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opIntSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond - std::optional opLongSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional opLongSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional>> opLongSeqAsync(const std::optional<::std::pair>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongSeqAsync(const std::optional<::std::pair>& p1, - ::std::function>, std::optional<::std::pair>)> response, + opLongSeqAsync(const std::optional<::std::pair>& p1, + ::std::function>, std::optional<::std::pair>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; + void _iceI_opLongSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional<::std::pair>&, const ::Ice::Context&) const; /// \endcond std::optional opFloatSeq(const std::optional<::std::pair>& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1076,13 +1076,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1090,13 +1090,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1118,13 +1118,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1158,7 +1158,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1167,7 +1167,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1178,7 +1178,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1201,7 +1201,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1239,7 +1239,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1250,11 +1250,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1298,7 +1298,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1310,7 +1310,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1321,10 +1321,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA = 0; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA = 0; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1343,7 +1343,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1354,7 +1354,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1378,8 +1378,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB = 0; - std::optional md; + ::std::int32_t requiredB = 0; + std::optional<::std::int32_t> md; protected: @@ -1404,7 +1404,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1415,7 +1415,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1446,7 +1446,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1456,7 +1456,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1467,7 +1467,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1661,7 +1661,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1670,7 +1670,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1681,7 +1681,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1786,7 +1786,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1798,7 +1798,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1810,7 +1810,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1832,7 +1832,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1845,7 +1845,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1875,7 +1875,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1886,7 +1886,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -2011,17 +2011,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opOptionalException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opDerivedException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredException(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; + virtual void opRequiredException(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2031,11 +2031,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual std::optional<::Ice::Byte> opByte(std::optional<::Ice::Byte> p1, std::optional<::Ice::Byte>& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::uint8_t> opByte(std::optional<::std::uint8_t> p1, std::optional<::std::uint8_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2059,11 +2059,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual std::optional opShort(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int16_t> opShort(std::optional<::std::int16_t> p1, std::optional<::std::int16_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2073,11 +2073,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual std::optional opInt(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int32_t> opInt(std::optional<::std::int32_t> p1, std::optional<::std::int32_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2087,11 +2087,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual std::optional opLong(std::optional p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional<::std::int64_t> opLong(std::optional<::std::int64_t> p1, std::optional<::std::int64_t>& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2245,7 +2245,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opByteSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opByteSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByteSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2273,7 +2273,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opShortSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opShortSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShortSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2287,7 +2287,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opIntSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opIntSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIntSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2301,7 +2301,7 @@ class Initial : public virtual ::Ice::Object std::optional p3; }; - virtual std::optional opLongSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; + virtual std::optional opLongSeq(std::optional<::std::pair> p1, std::optional& p3, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLongSeq(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/optional/TestAMD.cpp b/slice2cpp/swift/test/Ice/optional/TestAMD.cpp index 75ea6d0110a3..b5a738cd30f5 100644 --- a/slice2cpp/swift/test/Ice/optional/TestAMD.cpp +++ b/slice2cpp/swift/test/Ice/optional/TestAMD.cpp @@ -318,19 +318,19 @@ Test::InitialPrx::_iceI_pingPong(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::InitialPrx::opOptionalException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opOptionalException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opOptionalExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -341,7 +341,7 @@ Test::InitialPrx::opOptionalExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opOptionalException_name); outAsync->invoke(iceC_Test_Initial_opOptionalException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -367,19 +367,19 @@ Test::InitialPrx::_iceI_opOptionalException(const ::std::shared_ptr<::IceInterna /// \endcond void -Test::InitialPrx::opDerivedException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opDerivedException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opDerivedExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -390,7 +390,7 @@ Test::InitialPrx::opDerivedExceptionAsync(const std::optional& iceP_a, cons /// \cond INTERNAL void -Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opDerivedException_name); outAsync->invoke(iceC_Test_Initial_opDerivedException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -416,19 +416,19 @@ Test::InitialPrx::_iceI_opDerivedException(const ::std::shared_ptr<::IceInternal /// \endcond void -Test::InitialPrx::opRequiredException(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredException(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context).get(); } ::std::future -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &InitialPrx::_iceI_opRequiredException, iceP_a, iceP_b, iceP_o, context); } ::std::function -Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, +Test::InitialPrx::opRequiredExceptionAsync(const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, ::std::function response, ::std::function ex, ::std::function sent, @@ -439,7 +439,7 @@ Test::InitialPrx::opRequiredExceptionAsync(const std::optional& iceP_a, con /// \cond INTERNAL void -Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const std::optional<::std::int32_t>& iceP_a, const std::optional<::std::string>& iceP_b, const std::optional<::std::shared_ptr>& iceP_o, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opRequiredException_name); outAsync->invoke(iceC_Test_Initial_opRequiredException_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -464,37 +464,37 @@ Test::InitialPrx::_iceI_opRequiredException(const ::std::shared_ptr<::IceInterna } /// \endcond -std::optional<::Ice::Byte> -Test::InitialPrx::opByte(const std::optional<::Ice::Byte>& iceP_p1, std::optional<::Ice::Byte>& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::uint8_t> +Test::InitialPrx::opByte(const std::optional<::std::uint8_t>& iceP_p1, std::optional<::std::uint8_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(true, this, &InitialPrx::_iceI_opByte, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional<::Ice::Byte>>> -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::uint8_t>>> +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional<::Ice::Byte>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::uint8_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opByte, iceP_p1, context); } ::std::function -Test::InitialPrx::opByteAsync(const std::optional<::Ice::Byte>& iceP_p1, - ::std::function, std::optional<::Ice::Byte>)> response, +Test::InitialPrx::opByteAsync(const std::optional<::std::uint8_t>& iceP_p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional<::Ice::Byte>>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::uint8_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional<::Ice::Byte>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::uint8_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opByte, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>& outAsync, const std::optional<::Ice::Byte>& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>& outAsync, const std::optional<::std::uint8_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opByte_name); outAsync->invoke(iceC_Test_Initial_opByte_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -505,7 +505,7 @@ Test::InitialPrx::_iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional<::Ice::Byte>> v; + ::std::tuple, std::optional<::std::uint8_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); @@ -560,37 +560,37 @@ Test::InitialPrx::_iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAs } /// \endcond -std::optional -Test::InitialPrx::opShort(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int16_t> +Test::InitialPrx::opShort(const std::optional<::std::int16_t>& iceP_p1, std::optional<::std::int16_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>>(true, this, &InitialPrx::_iceI_opShort, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int16_t>>> +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int16_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opShort, iceP_p1, context); } ::std::function -Test::InitialPrx::opShortAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opShortAsync(const std::optional<::std::int16_t>& iceP_p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int16_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int16_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opShort, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>& outAsync, const std::optional<::std::int16_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opShort_name); outAsync->invoke(iceC_Test_Initial_opShort_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -601,44 +601,44 @@ Test::InitialPrx::_iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingA nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int16_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opInt(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int32_t> +Test::InitialPrx::opInt(const std::optional<::std::int32_t>& iceP_p1, std::optional<::std::int32_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>>(true, this, &InitialPrx::_iceI_opInt, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int32_t>>> +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int32_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opInt, iceP_p1, context); } ::std::function -Test::InitialPrx::opIntAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opIntAsync(const std::optional<::std::int32_t>& iceP_p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int32_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int32_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opInt, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>& outAsync, const std::optional<::std::int32_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opInt_name); outAsync->invoke(iceC_Test_Initial_opInt_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -649,44 +649,44 @@ Test::InitialPrx::_iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsy nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int32_t>> v; istr->readAll({1, 3}, ::std::get<0>(v), ::std::get<1>(v)); return v; }); } /// \endcond -std::optional -Test::InitialPrx::opLong(const std::optional& iceP_p1, std::optional& iceP_p3, const ::Ice::Context& context) const +std::optional<::std::int64_t> +Test::InitialPrx::opLong(const std::optional<::std::int64_t>& iceP_p1, std::optional<::std::int64_t>& iceP_p3, const ::Ice::Context& context) const { - auto _result = _makePromiseOutgoing<::std::tuple, std::optional>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); + auto _result = _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>>(true, this, &InitialPrx::_iceI_opLong, iceP_p1, context).get(); iceP_p3 = ::std::get<1>(_result); return ::std::get<0>(_result); } -::std::future<::std::tuple, std::optional>> -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, const ::Ice::Context& context) const +::std::future<::std::tuple, std::optional<::std::int64_t>>> +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { - return _makePromiseOutgoing<::std::tuple, std::optional>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); + return _makePromiseOutgoing<::std::tuple, std::optional<::std::int64_t>>, ::std::promise>(false, this, &InitialPrx::_iceI_opLong, iceP_p1, context); } ::std::function -Test::InitialPrx::opLongAsync(const std::optional& iceP_p1, - ::std::function, std::optional)> response, +Test::InitialPrx::opLongAsync(const std::optional<::std::int64_t>& iceP_p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - auto _responseCb = [response](::std::tuple, std::optional>&& _result) + auto _responseCb = [response](::std::tuple, std::optional<::std::int64_t>>&& _result) { response(::std::get<0>(_result), ::std::get<1>(_result)); }; - return _makeLambdaOutgoing<::std::tuple, std::optional>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); + return _makeLambdaOutgoing<::std::tuple, std::optional<::std::int64_t>>>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Test::InitialPrx::_iceI_opLong, iceP_p1, context); } /// \cond INTERNAL void -Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>& outAsync, const std::optional& iceP_p1, const ::Ice::Context& context) const +Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>& outAsync, const std::optional<::std::int64_t>& iceP_p1, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Initial_opLong_name); outAsync->invoke(iceC_Test_Initial_opLong_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -697,7 +697,7 @@ Test::InitialPrx::_iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAs nullptr, [](::Ice::InputStream* istr) { - ::std::tuple, std::optional> v; + ::std::tuple, std::optional<::std::int64_t>> v; istr->readAll({2, 3}, ::std::get<1>(v), ::std::get<0>(v)); return v; }); @@ -3004,7 +3004,7 @@ Test::Initial::_iceD_opOptionalException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3021,7 +3021,7 @@ Test::Initial::_iceD_opDerivedException(::IceInternal::Incoming& inS, const ::Ic { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3038,7 +3038,7 @@ Test::Initial::_iceD_opRequiredException(::IceInternal::Incoming& inS, const ::I { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_a; + std::optional<::std::int32_t> iceP_a; std::optional<::std::string> iceP_b; std::optional<::std::shared_ptr> iceP_o; istr->readAll({1, 2, 3}, iceP_a, iceP_b, iceP_o); @@ -3055,11 +3055,11 @@ Test::Initial::_iceD_opByte(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional<::Ice::Byte> iceP_p1; + std::optional<::std::uint8_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional<::Ice::Byte>& ret, const std::optional<::Ice::Byte>& iceP_p3) + auto responseCB = [inA](const std::optional<::std::uint8_t>& ret, const std::optional<::std::uint8_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3099,11 +3099,11 @@ Test::Initial::_iceD_opShort(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int16_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int16_t>& ret, const std::optional<::std::int16_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3121,11 +3121,11 @@ Test::Initial::_iceD_opInt(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int32_t> iceP_p1; istr->readAll({2}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int32_t>& ret, const std::optional<::std::int32_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({1, 3}, ret, iceP_p3); @@ -3143,11 +3143,11 @@ Test::Initial::_iceD_opLong(::IceInternal::Incoming& inS, const ::Ice::Current& { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - std::optional iceP_p1; + std::optional<::std::int64_t> iceP_p1; istr->readAll({1}, iceP_p1); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](const std::optional& ret, const std::optional& iceP_p3) + auto responseCB = [inA](const std::optional<::std::int64_t>& ret, const std::optional<::std::int64_t>& iceP_p3) { auto ostr = inA->startWriteParams(); ostr->writeAll({2, 3}, iceP_p3, ret); diff --git a/slice2cpp/swift/test/Ice/optional/TestAMD.h b/slice2cpp/swift/test/Ice/optional/TestAMD.h index 861a9168bd6c..8c1f0ef01f6a 100644 --- a/slice2cpp/swift/test/Ice/optional/TestAMD.h +++ b/slice2cpp/swift/test/Ice/optional/TestAMD.h @@ -65,15 +65,15 @@ enum class MyEnum : unsigned char MyEnumMember }; -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; using BoolSeq = ::std::vector; -using ShortSeq = ::std::vector; +using ShortSeq = ::std::vector<::std::int16_t>; -using IntSeq = ::std::vector; +using IntSeq = ::std::vector<::std::int32_t>; -using LongSeq = ::std::vector; +using LongSeq = ::std::vector<::std::int64_t>; using FloatSeq = ::std::vector; @@ -97,21 +97,21 @@ using OneOptionalSeq = ::std::vector<::std::shared_ptr>; using MyInterfacePrxSeq = ::std::vector<::std::optional>; -using Serializable = ::std::vector<::Ice::Byte>; +using Serializable = ::std::vector<::std::uint8_t>; -using IntIntDict = ::std::map; +using IntIntDict = ::std::map<::std::int32_t, ::std::int32_t>; -using StringIntDict = ::std::map<::std::string, int>; +using StringIntDict = ::std::map<::std::string, ::std::int32_t>; -using IntEnumDict = ::std::map; +using IntEnumDict = ::std::map<::std::int32_t, MyEnum>; -using IntFixedStructDict = ::std::map; +using IntFixedStructDict = ::std::map<::std::int32_t, FixedStruct>; -using IntVarStructDict = ::std::map; +using IntVarStructDict = ::std::map<::std::int32_t, VarStruct>; -using IntOneOptionalDict = ::std::map>; +using IntOneOptionalDict = ::std::map<::std::int32_t, ::std::shared_ptr>; -using IntMyInterfacePrxDict = ::std::map>; +using IntMyInterfacePrxDict = ::std::map<::std::int32_t, ::std::optional>; using RecursiveSeq = ::std::vector<::std::shared_ptr>; @@ -219,64 +219,64 @@ class InitialPrx : public ::Ice::Proxy void _iceI_pingPong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::Value>>>&, const ::std::shared_ptr<::Ice::Value>&, const ::Ice::Context&) const; /// \endcond - void opOptionalException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opOptionalException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opOptionalExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opOptionalExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opOptionalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opDerivedException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opDerivedException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opDerivedExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opDerivedExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opDerivedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - void opRequiredException(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void opRequiredException(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opRequiredExceptionAsync(const std::optional& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, + opRequiredExceptionAsync(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; + void _iceI_opRequiredException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const std::optional<::std::int32_t>&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr>&, const ::Ice::Context&) const; /// \endcond - std::optional<::Ice::Byte> opByte(const std::optional<::Ice::Byte>& p1, std::optional<::Ice::Byte>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::uint8_t> opByte(const std::optional<::std::uint8_t>& p1, std::optional<::std::uint8_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional<::Ice::Byte>>> opByteAsync(const std::optional<::Ice::Byte>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::uint8_t>>> opByteAsync(const std::optional<::std::uint8_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opByteAsync(const std::optional<::Ice::Byte>& p1, - ::std::function, std::optional<::Ice::Byte>)> response, + opByteAsync(const std::optional<::std::uint8_t>& p1, + ::std::function, std::optional<::std::uint8_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::Ice::Byte>>>>&, const std::optional<::Ice::Byte>&, const ::Ice::Context&) const; + void _iceI_opByte(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::uint8_t>>>>&, const std::optional<::std::uint8_t>&, const ::Ice::Context&) const; /// \endcond std::optional opBool(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -294,49 +294,49 @@ class InitialPrx : public ::Ice::Proxy void _iceI_opBool(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; /// \endcond - std::optional opShort(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int16_t> opShort(const std::optional<::std::int16_t>& p1, std::optional<::std::int16_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opShortAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int16_t>>> opShortAsync(const std::optional<::std::int16_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opShortAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opShortAsync(const std::optional<::std::int16_t>& p1, + ::std::function, std::optional<::std::int16_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opShort(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int16_t>>>>&, const std::optional<::std::int16_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opInt(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int32_t> opInt(const std::optional<::std::int32_t>& p1, std::optional<::std::int32_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opIntAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int32_t>>> opIntAsync(const std::optional<::std::int32_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIntAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opIntAsync(const std::optional<::std::int32_t>& p1, + ::std::function, std::optional<::std::int32_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opInt(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int32_t>>>>&, const std::optional<::std::int32_t>&, const ::Ice::Context&) const; /// \endcond - std::optional opLong(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + std::optional<::std::int64_t> opLong(const std::optional<::std::int64_t>& p1, std::optional<::std::int64_t>& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future<::std::tuple, std::optional>> opLongAsync(const std::optional& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::tuple, std::optional<::std::int64_t>>> opLongAsync(const std::optional<::std::int64_t>& p1, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opLongAsync(const std::optional& p1, - ::std::function, std::optional)> response, + opLongAsync(const std::optional<::std::int64_t>& p1, + ::std::function, std::optional<::std::int64_t>)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional>>>&, const std::optional&, const ::Ice::Context&) const; + void _iceI_opLong(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple, std::optional<::std::int64_t>>>>&, const std::optional<::std::int64_t>&, const ::Ice::Context&) const; /// \endcond std::optional opFloat(const std::optional& p1, std::optional& p3, const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -1044,13 +1044,13 @@ namespace Test struct SmallStruct { - ::Ice::Byte m; + ::std::uint8_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1058,13 +1058,13 @@ struct SmallStruct struct FixedStruct { - int m; + ::std::int32_t m; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(m); } @@ -1086,13 +1086,13 @@ struct VarStruct struct ClassVarStruct { - int a; + ::std::int32_t a; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1126,7 +1126,7 @@ class OneOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit OneOptional(const std::optional& a) : + explicit OneOptional(const std::optional<::std::int32_t>& a) : a(a) { } @@ -1135,7 +1135,7 @@ class OneOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(a); } @@ -1146,7 +1146,7 @@ class OneOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a; + std::optional<::std::int32_t> a; }; /// \cond INTERNAL @@ -1169,7 +1169,7 @@ class MultiOptional : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - MultiOptional(const std::optional<::Ice::Byte>& a, const std::optional& b, const std::optional& c, const std::optional& d, const std::optional& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : + MultiOptional(const std::optional<::std::uint8_t>& a, const std::optional& b, const std::optional<::std::int16_t>& c, const std::optional<::std::int32_t>& d, const std::optional<::std::int64_t>& e, const std::optional& f, const std::optional& g, const std::optional<::std::string>& h, const std::optional<::Test::MyEnum>& i, const std::optional<::std::optional<::Test::MyInterfacePrx>>& j, const std::optional<::std::shared_ptr<::Test::MultiOptional>>& k, const std::optional<::Test::ByteSeq>& bs, const std::optional<::Test::StringSeq>& ss, const std::optional<::Test::IntIntDict>& iid, const std::optional<::Test::StringIntDict>& sid, const std::optional<::Test::FixedStruct>& fs, const std::optional<::Test::VarStruct>& vs, const std::optional<::Test::ShortSeq>& shs, const std::optional<::Test::MyEnumSeq>& es, const std::optional<::Test::FixedStructSeq>& fss, const std::optional<::Test::VarStructSeq>& vss, const std::optional<::Test::OneOptionalSeq>& oos, const std::optional<::Test::MyInterfacePrxSeq>& mips, const std::optional<::Test::IntEnumDict>& ied, const std::optional<::Test::IntFixedStructDict>& ifsd, const std::optional<::Test::IntVarStructDict>& ivsd, const std::optional<::Test::IntOneOptionalDict>& iood, const std::optional<::Test::IntMyInterfacePrxDict>& imipd, const std::optional<::Test::BoolSeq>& bos, const std::optional<::Test::Serializable>& ser) : a(a), b(b), c(c), @@ -1207,7 +1207,7 @@ class MultiOptional : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const + std::tuple&, const std::optional&, const std::optional<::std::int16_t>&, const std::optional<::std::int32_t>&, const std::optional<::std::int64_t>&, const std::optional&, const std::optional&, const std::optional<::std::string>&, const std::optional<::Test::MyEnum>&, const std::optional<::std::optional<::Test::MyInterfacePrx>>&, const std::optional<::std::shared_ptr<::Test::MultiOptional>>&, const std::optional<::Test::ByteSeq>&, const std::optional<::Test::StringSeq>&, const std::optional<::Test::IntIntDict>&, const std::optional<::Test::StringIntDict>&, const std::optional<::Test::FixedStruct>&, const std::optional<::Test::VarStruct>&, const std::optional<::Test::ShortSeq>&, const std::optional<::Test::MyEnumSeq>&, const std::optional<::Test::FixedStructSeq>&, const std::optional<::Test::VarStructSeq>&, const std::optional<::Test::OneOptionalSeq>&, const std::optional<::Test::MyInterfacePrxSeq>&, const std::optional<::Test::IntEnumDict>&, const std::optional<::Test::IntFixedStructDict>&, const std::optional<::Test::IntVarStructDict>&, const std::optional<::Test::IntOneOptionalDict>&, const std::optional<::Test::IntMyInterfacePrxDict>&, const std::optional<::Test::BoolSeq>&, const std::optional<::Test::Serializable>&> ice_tuple() const { return std::tie(a, b, c, d, e, f, g, h, i, j, k, bs, ss, iid, sid, fs, vs, shs, es, fss, vss, oos, mips, ied, ifsd, ivsd, iood, imipd, bos, ser); } @@ -1218,11 +1218,11 @@ class MultiOptional : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional<::Ice::Byte> a; + std::optional<::std::uint8_t> a; std::optional b; - std::optional c; - std::optional d; - std::optional e; + std::optional<::std::int16_t> c; + std::optional<::std::int32_t> d; + std::optional<::std::int64_t> e; std::optional f; std::optional g; std::optional<::std::string> h; @@ -1266,7 +1266,7 @@ class A : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - A(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc) : + A(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc) : requiredA(requiredA), ma(ma), mb(mb), @@ -1278,7 +1278,7 @@ class A : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc); } @@ -1289,10 +1289,10 @@ class A : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int requiredA; - std::optional ma; - std::optional mb; - std::optional mc; + ::std::int32_t requiredA; + std::optional<::std::int32_t> ma; + std::optional<::std::int32_t> mb; + std::optional<::std::int32_t> mc; }; class B : public ::Ice::ValueHelper @@ -1311,7 +1311,7 @@ class B : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - B(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md) : + B(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md) : Ice::ValueHelper(requiredA, ma, mb, mc), requiredB(requiredB), md(md) @@ -1322,7 +1322,7 @@ class B : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md); } @@ -1346,8 +1346,8 @@ class B : public ::Ice::ValueHelper virtual void _iceRead(::Ice::InputStream*) override; /// \endcond - int requiredB; - std::optional md; + ::std::int32_t requiredB; + std::optional<::std::int32_t> md; protected: @@ -1372,7 +1372,7 @@ class C : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - C(int requiredA, const std::optional& ma, const std::optional& mb, const std::optional& mc, int requiredB, const std::optional& md, const ::std::string& ss, const std::optional<::std::string>& ms) : + C(::std::int32_t requiredA, const std::optional<::std::int32_t>& ma, const std::optional<::std::int32_t>& mb, const std::optional<::std::int32_t>& mc, ::std::int32_t requiredB, const std::optional<::std::int32_t>& md, const ::std::string& ss, const std::optional<::std::string>& ms) : Ice::ValueHelper(requiredA, ma, mb, mc, requiredB, md), ss(ss), ms(ms) @@ -1383,7 +1383,7 @@ class C : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&, const std::optional&, const int&, const std::optional&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&, const std::optional<::std::int32_t>&, const ::std::int32_t&, const std::optional<::std::int32_t>&, const ::std::string&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(requiredA, ma, mb, mc, requiredB, md, ss, ms); } @@ -1414,7 +1414,7 @@ class WD : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - WD(const std::optional& a, const std::optional<::std::string>& s) : + WD(const std::optional<::std::int32_t>& a, const std::optional<::std::string>& s) : a(a), s(s) { @@ -1424,7 +1424,7 @@ class WD : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional<::std::string>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&> ice_tuple() const { return std::tie(a, s); } @@ -1435,7 +1435,7 @@ class WD : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - std::optional a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> s{"test"}; }; @@ -1629,7 +1629,7 @@ class G2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit G2(long long int a) : + explicit G2(::std::int64_t a) : a(a) { } @@ -1638,7 +1638,7 @@ class G2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(a); } @@ -1649,7 +1649,7 @@ class G2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - long long int a; + ::std::int64_t a; }; class G : public ::Ice::ValueHelper @@ -1754,7 +1754,7 @@ class OptionalException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : + OptionalException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o) : req(req), a(a), b(b), @@ -1766,7 +1766,7 @@ class OptionalException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&> ice_tuple() const { return std::tie(req, a, b, o); } @@ -1778,7 +1778,7 @@ class OptionalException : public ::Ice::UserExceptionHelper a = 5; + std::optional<::std::int32_t> a = 5; std::optional<::std::string> b; std::optional<::std::shared_ptr<::Test::OneOptional>> o; }; @@ -1800,7 +1800,7 @@ class DerivedException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : + DerivedException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& d1, const std::optional<::std::string>& ss, const std::optional<::std::shared_ptr>& o2, const ::std::string& d2) : ::Ice::UserExceptionHelper(req, a, b, o), d1(d1), ss(ss), @@ -1813,7 +1813,7 @@ class DerivedException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&> ice_tuple() const { return std::tie(req, a, b, o, d1, ss, o2, d2); } @@ -1843,7 +1843,7 @@ class RequiredException : public ::Ice::UserExceptionHelper& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : + RequiredException(bool req, const std::optional<::std::int32_t>& a, const std::optional<::std::string>& b, const std::optional<::std::shared_ptr>& o, const ::std::string& ss, const ::std::shared_ptr& o2) : ::Ice::UserExceptionHelper(req, a, b, o), ss(ss), o2(o2) @@ -1854,7 +1854,7 @@ class RequiredException : public ::Ice::UserExceptionHelper&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const + std::tuple&, const std::optional<::std::string>&, const std::optional<::std::shared_ptr<::Test::OneOptional>>&, const ::std::string&, const ::std::shared_ptr<::Test::OneOptional>&> ice_tuple() const { return std::tie(req, a, b, o, ss, o2); } @@ -1966,17 +1966,17 @@ class Initial : public virtual ::Ice::Object bool _iceD_pingPong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opOptionalExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opOptionalExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opOptionalException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opDerivedExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opDerivedExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opDerivedException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void opRequiredExceptionAsync(std::optional a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opRequiredExceptionAsync(std::optional<::std::int32_t> a, std::optional<::std::string> b, std::optional<::std::shared_ptr> o, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opRequiredException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -1986,11 +1986,11 @@ class Initial : public virtual ::Ice::Object */ struct OpByteResult { - std::optional<::Ice::Byte> returnValue; - std::optional<::Ice::Byte> p3; + std::optional<::std::uint8_t> returnValue; + std::optional<::std::uint8_t> p3; }; - virtual void opByteAsync(std::optional<::Ice::Byte> p1, ::std::function& returnValue, const std::optional<::Ice::Byte>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opByteAsync(std::optional<::std::uint8_t> p1, ::std::function& returnValue, const std::optional<::std::uint8_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opByte(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2014,11 +2014,11 @@ class Initial : public virtual ::Ice::Object */ struct OpShortResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int16_t> returnValue; + std::optional<::std::int16_t> p3; }; - virtual void opShortAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opShortAsync(std::optional<::std::int16_t> p1, ::std::function& returnValue, const std::optional<::std::int16_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opShort(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2028,11 +2028,11 @@ class Initial : public virtual ::Ice::Object */ struct OpIntResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int32_t> returnValue; + std::optional<::std::int32_t> p3; }; - virtual void opIntAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opIntAsync(std::optional<::std::int32_t> p1, ::std::function& returnValue, const std::optional<::std::int32_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opInt(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -2042,11 +2042,11 @@ class Initial : public virtual ::Ice::Object */ struct OpLongResult { - std::optional returnValue; - std::optional p3; + std::optional<::std::int64_t> returnValue; + std::optional<::std::int64_t> p3; }; - virtual void opLongAsync(std::optional p1, ::std::function& returnValue, const std::optional& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void opLongAsync(std::optional<::std::int64_t> p1, ::std::function& returnValue, const std::optional<::std::int64_t>& p3)> response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opLong(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/retry/Test.cpp b/slice2cpp/swift/test/Ice/retry/Test.cpp index ee86b069d353..861ae2bfa6b8 100644 --- a/slice2cpp/swift/test/Ice/retry/Test.cpp +++ b/slice2cpp/swift/test/Ice/retry/Test.cpp @@ -97,31 +97,31 @@ Test::RetryPrx::_iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); + return _makePromiseOutgoing<::std::int32_t>(true, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context).get(); } -::std::future -Test::RetryPrx::opIdempotentAsync(int iceP_c, const ::Ice::Context& context) const +::std::future<::std::int32_t> +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &RetryPrx::_iceI_opIdempotent, iceP_c, context); } ::std::function -Test::RetryPrx::opIdempotentAsync(int iceP_c, - ::std::function response, +Test::RetryPrx::opIdempotentAsync(::std::int32_t iceP_c, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &Test::RetryPrx::_iceI_opIdempotent, iceP_c, context); } /// \cond INTERNAL void -Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_c, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_c, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_Test_Retry_opIdempotent_name); outAsync->invoke(iceC_Test_Retry_opIdempotent_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, @@ -196,19 +196,19 @@ Test::RetryPrx::_iceI_opSystemException(const ::std::shared_ptr<::IceInternal::O /// \endcond void -Test::RetryPrx::sleep(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleep(::std::int32_t iceP_delay, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &RetryPrx::_iceI_sleep, iceP_delay, context).get(); } ::std::future -Test::RetryPrx::sleepAsync(int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &RetryPrx::_iceI_sleep, iceP_delay, context); } ::std::function -Test::RetryPrx::sleepAsync(int iceP_delay, +Test::RetryPrx::sleepAsync(::std::int32_t iceP_delay, ::std::function response, ::std::function ex, ::std::function sent, @@ -219,7 +219,7 @@ Test::RetryPrx::sleepAsync(int iceP_delay, /// \cond INTERNAL void -Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_delay, const ::Ice::Context& context) const +Test::RetryPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_delay, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Retry_sleep_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -313,10 +313,10 @@ Test::Retry::_iceD_opIdempotent(::IceInternal::Incoming& inS, const ::Ice::Curre { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_c; + ::std::int32_t iceP_c; istr->readAll(iceP_c); inS.endReadParams(); - int ret = this->opIdempotent(iceP_c, current); + ::std::int32_t ret = this->opIdempotent(iceP_c, current); auto ostr = inS.startWriteParams(); ostr->writeAll(ret); inS.endWriteParams(); @@ -354,7 +354,7 @@ Test::Retry::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& cur { _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode); auto istr = inS.startReadParams(); - int iceP_delay; + ::std::int32_t iceP_delay; istr->readAll(iceP_delay); inS.endReadParams(); this->sleep(iceP_delay, current); diff --git a/slice2cpp/swift/test/Ice/retry/Test.h b/slice2cpp/swift/test/Ice/retry/Test.h index 5c5ba2348735..e76f1fbe7a00 100644 --- a/slice2cpp/swift/test/Ice/retry/Test.h +++ b/slice2cpp/swift/test/Ice/retry/Test.h @@ -63,19 +63,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_op(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, bool, const ::Ice::Context&) const; /// \endcond - int opIdempotent(int c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future opIdempotentAsync(int c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> opIdempotentAsync(::std::int32_t c, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - opIdempotentAsync(int c, - ::std::function response, + opIdempotentAsync(::std::int32_t c, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_opIdempotent(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void opNotIdempotent(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -106,19 +106,19 @@ class RetryPrx : public ::Ice::Proxy void _iceI_opSystemException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; /// \endcond - void sleep(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t delay, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int delay, + sleepAsync(::std::int32_t delay, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void shutdown(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -227,7 +227,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_op(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual int opIdempotent(int c, const ::Ice::Current& current) = 0; + virtual ::std::int32_t opIdempotent(::std::int32_t c, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_opIdempotent(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -242,7 +242,7 @@ class Retry : public virtual ::Ice::Object bool _iceD_opSystemException(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int delay, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t delay, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/scope/Test.h b/slice2cpp/swift/test/Ice/scope/Test.h index fc98d976a2a0..1468c28d7647 100644 --- a/slice2cpp/swift/test/Ice/scope/Test.h +++ b/slice2cpp/swift/test/Ice/scope/Test.h @@ -899,13 +899,13 @@ namespace Test struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -948,13 +948,13 @@ namespace Inner struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } @@ -965,13 +965,13 @@ namespace Inner2 struct S { - int v; + ::std::int32_t v; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v); } diff --git a/slice2cpp/swift/test/Ice/slicing/objects/ClientPrivate.h b/slice2cpp/swift/test/Ice/slicing/objects/ClientPrivate.h index e09124ade434..3d94a6123b1b 100644 --- a/slice2cpp/swift/test/Ice/slicing/objects/ClientPrivate.h +++ b/slice2cpp/swift/test/Ice/slicing/objects/ClientPrivate.h @@ -104,7 +104,7 @@ class PCUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCUnknown(int pi, const ::std::string& pu) : + PCUnknown(::std::int32_t pi, const ::std::string& pu) : Ice::ValueHelper(pi), pu(pu) { @@ -114,7 +114,7 @@ class PCUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, pu); } @@ -163,7 +163,7 @@ class PCDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : + PCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -173,7 +173,7 @@ class PCDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } @@ -203,7 +203,7 @@ class PCDerived2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2) : + PCDerived2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2) : Ice::ValueHelper(pi, ps, pb, pbs), pcd2(pcd2) { @@ -213,7 +213,7 @@ class PCDerived2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2); } @@ -224,7 +224,7 @@ class PCDerived2 : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pcd2; + ::std::int32_t pcd2; }; class PCDerived3 : public ::Ice::ValueHelper @@ -243,7 +243,7 @@ class PCDerived3 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PCDerived3(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, int pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : + PCDerived3(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs, ::std::int32_t pcd2, const ::std::shared_ptr<::Ice::Value>& pcd3) : Ice::ValueHelper(pi, ps, pb, pbs, pcd2), pcd3(pcd3) { @@ -253,7 +253,7 @@ class PCDerived3 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::Test::PBaseSeq&, const int&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&, const ::std::int32_t&, const ::std::shared_ptr<::Ice::Value>&> ice_tuple() const { return std::tie(pi, ps, pb, pbs, pcd2, pcd3); } @@ -283,7 +283,7 @@ class CompactPCDerived : public ::Ice::ValueHelper& pb, const ::Test::PBaseSeq& pbs) : + CompactPCDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb, const ::Test::PBaseSeq& pbs) : Ice::ValueHelper(pi, ps, pb), pbs(pbs) { @@ -293,7 +293,7 @@ class CompactPCDerived : public ::Ice::ValueHelper&, const ::Test::PBaseSeq&> ice_tuple() const + std::tuple&, const ::Test::PBaseSeq&> ice_tuple() const { return std::tie(pi, ps, pb, pbs); } diff --git a/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivate.h b/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivate.h index ac8f7ad46561..ace8c39a13ee 100644 --- a/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivate.h +++ b/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivate.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivateAMD.h b/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivateAMD.h index 6a250c9a6162..0ebb7ec63611 100644 --- a/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivateAMD.h +++ b/slice2cpp/swift/test/Ice/slicing/objects/ServerPrivateAMD.h @@ -233,7 +233,7 @@ class MyClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit MyClass(int i) : + explicit MyClass(::std::int32_t i) : i(i) { } @@ -242,7 +242,7 @@ class MyClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -253,7 +253,7 @@ class MyClass : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int i; + ::std::int32_t i; }; class PSUnknown : public ::Ice::ValueHelper @@ -272,7 +272,7 @@ class PSUnknown : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown(int pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : + PSUnknown(::std::int32_t pi, const ::std::string& ps, const ::std::string& psu, const ::std::shared_ptr<::Test::PNode>& graph, const ::std::shared_ptr<::Test::MyClass>& cl) : Ice::ValueHelper(pi, ps), psu(psu), graph(graph), @@ -284,7 +284,7 @@ class PSUnknown : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const + std::tuple&, const ::std::shared_ptr<::Test::MyClass>&> ice_tuple() const { return std::tie(pi, ps, psu, graph, cl); } @@ -316,7 +316,7 @@ class PSUnknown2 : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PSUnknown2(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PSUnknown2(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -326,7 +326,7 @@ class PSUnknown2 : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/swift/test/Ice/slicing/objects/Test.h b/slice2cpp/swift/test/Ice/slicing/objects/Test.h index 83914be23c07..55cff72d32e4 100644 --- a/slice2cpp/swift/test/Ice/slicing/objects/Test.h +++ b/slice2cpp/swift/test/Ice/slicing/objects/Test.h @@ -55,7 +55,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -952,7 +952,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -961,7 +961,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -972,7 +972,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -991,7 +991,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1001,7 +1001,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1050,7 +1050,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1060,7 +1060,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } @@ -1090,7 +1090,7 @@ class CompactPDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - CompactPDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + CompactPDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1100,7 +1100,7 @@ class CompactPDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/swift/test/Ice/slicing/objects/TestAMD.h b/slice2cpp/swift/test/Ice/slicing/objects/TestAMD.h index 1f218d17bb88..319dd6bf401a 100644 --- a/slice2cpp/swift/test/Ice/slicing/objects/TestAMD.h +++ b/slice2cpp/swift/test/Ice/slicing/objects/TestAMD.h @@ -54,7 +54,7 @@ namespace Test using BSeq = ::std::vector<::std::shared_ptr>; -using BDict = ::std::map>; +using BDict = ::std::map<::std::int32_t, ::std::shared_ptr>; using PBaseSeq = ::std::vector<::std::shared_ptr>; @@ -951,7 +951,7 @@ class PBase : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - explicit PBase(int pi) : + explicit PBase(::std::int32_t pi) : pi(pi) { } @@ -960,7 +960,7 @@ class PBase : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi); } @@ -971,7 +971,7 @@ class PBase : public ::Ice::ValueHelper */ static const ::std::string& ice_staticId(); - int pi; + ::std::int32_t pi; }; class Preserved : public ::Ice::ValueHelper @@ -990,7 +990,7 @@ class Preserved : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Preserved(int pi, const ::std::string& ps) : + Preserved(::std::int32_t pi, const ::std::string& ps) : Ice::ValueHelper(pi), ps(ps) { @@ -1000,7 +1000,7 @@ class Preserved : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(pi, ps); } @@ -1049,7 +1049,7 @@ class PDerived : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - PDerived(int pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : + PDerived(::std::int32_t pi, const ::std::string& ps, const ::std::shared_ptr<::Test::PBase>& pb) : Ice::ValueHelper(pi, ps), pb(pb) { @@ -1059,7 +1059,7 @@ class PDerived : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(pi, ps, pb); } diff --git a/slice2cpp/swift/test/Ice/stream/Test.h b/slice2cpp/swift/test/Ice/stream/Test.h index debc9f91ee1c..c284c671a4f9 100644 --- a/slice2cpp/swift/test/Ice/stream/Test.h +++ b/slice2cpp/swift/test/Ice/stream/Test.h @@ -101,11 +101,11 @@ using SmallStructSS = ::std::vector; using MyClassSS = ::std::vector; -using ByteBoolD = ::std::map<::Ice::Byte, bool>; +using ByteBoolD = ::std::map<::std::uint8_t, bool>; -using ShortIntD = ::std::map; +using ShortIntD = ::std::map<::std::int16_t, ::std::int32_t>; -using LongFloatD = ::std::map; +using LongFloatD = ::std::map<::std::int64_t, float>; using StringStringD = ::std::map<::std::string, ::std::string>; @@ -205,10 +205,10 @@ namespace Test struct SmallStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -219,7 +219,7 @@ struct SmallStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple&> ice_tuple() const + std::tuple&> ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e, p); } @@ -227,13 +227,13 @@ struct SmallStruct struct ClassStruct { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -245,10 +245,10 @@ namespace Sub struct NestedStruct { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -258,7 +258,7 @@ struct NestedStruct * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e); } @@ -266,13 +266,13 @@ struct NestedStruct struct NestedClassStruct { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -305,10 +305,10 @@ namespace Sub2 struct NestedStruct2 { bool bo; - ::Ice::Byte by; - short sh; - int i; - long long int l; + ::std::uint8_t by; + ::std::int16_t sh; + ::std::int32_t i; + ::std::int64_t l; float f; double d; ::std::string str; @@ -318,7 +318,7 @@ struct NestedStruct2 * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(bo, by, sh, i, l, f, d, str, e); } @@ -326,13 +326,13 @@ struct NestedStruct2 struct NestedClassStruct2 { - int i; + ::std::int32_t i; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(i); } @@ -375,7 +375,7 @@ class OptionalClass : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - OptionalClass(bool bo, ::Ice::Byte by, const std::optional& sh, const std::optional& i) : + OptionalClass(bool bo, ::std::uint8_t by, const std::optional<::std::int16_t>& sh, const std::optional<::std::int32_t>& i) : bo(bo), by(by), sh(sh), @@ -387,7 +387,7 @@ class OptionalClass : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const std::optional&> ice_tuple() const + std::tuple&, const std::optional<::std::int32_t>&> ice_tuple() const { return std::tie(bo, by, sh, i); } @@ -399,9 +399,9 @@ class OptionalClass : public ::Ice::ValueHelper static const ::std::string& ice_staticId(); bool bo; - ::Ice::Byte by; - std::optional sh; - std::optional i; + ::std::uint8_t by; + std::optional<::std::int16_t> sh; + std::optional<::std::int32_t> i; }; /// \cond INTERNAL diff --git a/slice2cpp/swift/test/Ice/timeout/Test.cpp b/slice2cpp/swift/test/Ice/timeout/Test.cpp index fc218969ac8f..64970fe3fbb6 100644 --- a/slice2cpp/swift/test/Ice/timeout/Test.cpp +++ b/slice2cpp/swift/test/Ice/timeout/Test.cpp @@ -142,19 +142,19 @@ Test::TimeoutPrx::_iceI_sendData(const ::std::shared_ptr<::IceInternal::Outgoing /// \endcond void -Test::TimeoutPrx::sleep(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleep(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &TimeoutPrx::_iceI_sleep, iceP_to, context).get(); } ::std::future -Test::TimeoutPrx::sleepAsync(int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &TimeoutPrx::_iceI_sleep, iceP_to, context); } ::std::function -Test::TimeoutPrx::sleepAsync(int iceP_to, +Test::TimeoutPrx::sleepAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -165,7 +165,7 @@ Test::TimeoutPrx::sleepAsync(int iceP_to, /// \cond INTERNAL void -Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::TimeoutPrx::_iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Timeout_sleep_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -183,19 +183,19 @@ Test::TimeoutPrx::ice_staticId() } void -Test::ControllerPrx::holdAdapter(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapter(::std::int32_t iceP_to, const ::Ice::Context& context) const { _makePromiseOutgoing(true, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context).get(); } ::std::future -Test::ControllerPrx::holdAdapterAsync(int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, const ::Ice::Context& context) const { return _makePromiseOutgoing(false, this, &ControllerPrx::_iceI_holdAdapter, iceP_to, context); } ::std::function -Test::ControllerPrx::holdAdapterAsync(int iceP_to, +Test::ControllerPrx::holdAdapterAsync(::std::int32_t iceP_to, ::std::function response, ::std::function ex, ::std::function sent, @@ -206,7 +206,7 @@ Test::ControllerPrx::holdAdapterAsync(int iceP_to, /// \cond INTERNAL void -Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_to, const ::Ice::Context& context) const +Test::ControllerPrx::_iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int32_t iceP_to, const ::Ice::Context& context) const { outAsync->invoke(iceC_Test_Controller_holdAdapter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, [&](::Ice::OutputStream* ostr) @@ -343,7 +343,7 @@ Test::Timeout::_iceD_sleep(::IceInternal::Incoming& inS, const ::Ice::Current& c { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->sleep(iceP_to, current); @@ -432,7 +432,7 @@ Test::Controller::_iceD_holdAdapter(::IceInternal::Incoming& inS, const ::Ice::C { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_to; + ::std::int32_t iceP_to; istr->readAll(iceP_to); inS.endReadParams(); this->holdAdapter(iceP_to, current); diff --git a/slice2cpp/swift/test/Ice/timeout/Test.h b/slice2cpp/swift/test/Ice/timeout/Test.h index 2a28fe9cf829..324575dca94e 100644 --- a/slice2cpp/swift/test/Ice/timeout/Test.h +++ b/slice2cpp/swift/test/Ice/timeout/Test.h @@ -43,7 +43,7 @@ using ControllerPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } @@ -83,19 +83,19 @@ class TimeoutPrx : public ::Ice::Proxy void _iceI_sendData(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ByteSeq&, const ::Ice::Context&) const; /// \endcond - void sleep(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void sleep(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future sleepAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future sleepAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - sleepAsync(int to, + sleepAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_sleep(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -150,19 +150,19 @@ class ControllerPrx : public ::Ice::Proxy { public: - void holdAdapter(int to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void holdAdapter(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future holdAdapterAsync(int to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future holdAdapterAsync(::std::int32_t to, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - holdAdapterAsync(int to, + holdAdapterAsync(::std::int32_t to, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_holdAdapter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond void resumeAdapter(const ::Ice::Context& context = ::Ice::noExplicitContext) const; @@ -290,7 +290,7 @@ class Timeout : public virtual ::Ice::Object bool _iceD_sendData(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond - virtual void sleep(int to, const ::Ice::Current& current) = 0; + virtual void sleep(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_sleep(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond @@ -334,7 +334,7 @@ class Controller : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void holdAdapter(int to, const ::Ice::Current& current) = 0; + virtual void holdAdapter(::std::int32_t to, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_holdAdapter(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cpp/swift/test/Ice/udp/Test.h b/slice2cpp/swift/test/Ice/udp/Test.h index 0dc1af098509..2a27862383e0 100644 --- a/slice2cpp/swift/test/Ice/udp/Test.h +++ b/slice2cpp/swift/test/Ice/udp/Test.h @@ -44,7 +44,7 @@ using TestIntfPrxPtr = ::std::optional; namespace Test { -using ByteSeq = ::std::vector<::Ice::Byte>; +using ByteSeq = ::std::vector<::std::uint8_t>; } diff --git a/slice2cpp/swift/test/Slice/escape/Clash.h b/slice2cpp/swift/test/Slice/escape/Clash.h index ef9b6bf2d606..949d63028da6 100644 --- a/slice2cpp/swift/test/Slice/escape/Clash.h +++ b/slice2cpp/swift/test/Slice/escape/Clash.h @@ -275,15 +275,15 @@ namespace Clash struct St { ::std::string v; - short istr; - int ostr; - int rhs; + ::std::int16_t istr; + ::std::int32_t ostr; + ::std::int32_t rhs; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(v, istr, ostr, rhs); } @@ -317,7 +317,7 @@ class Cls : public ::Ice::ValueHelper /** * One-shot constructor to initialize all data members. */ - Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, int current, short response, const ::std::string& upCast, int typeId, short del, const std::optional& cookie, const ::std::string& ex, int result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : + Cls(const ::std::optional<::Clash::IntfPrx>& s, const ::std::string& context, ::std::int32_t current, ::std::int16_t response, const ::std::string& upCast, ::std::int32_t typeId, ::std::int16_t del, const std::optional<::std::int16_t>& cookie, const ::std::string& ex, ::std::int32_t result, const ::std::string& istr, const ::std::string& ostr, const ::std::string& inS, const ::std::string& in, const ::std::string& proxy) : s(s), context(context), current(current), @@ -340,7 +340,7 @@ class Cls : public ::Ice::ValueHelper * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const ::std::string&, const int&, const short&, const ::std::string&, const int&, const short&, const std::optional&, const ::std::string&, const int&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const + std::tuple&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const ::std::string&, const ::std::int32_t&, const ::std::int16_t&, const std::optional<::std::int16_t>&, const ::std::string&, const ::std::int32_t&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const { return std::tie(s, context, current, response, upCast, typeId, del, cookie, ex, result, istr, ostr, inS, in, proxy); } @@ -353,14 +353,14 @@ class Cls : public ::Ice::ValueHelper ::std::optional<::Clash::IntfPrx> s; ::std::string context; - int current; - short response; + ::std::int32_t current; + ::std::int16_t response; ::std::string upCast; - int typeId; - short del; - std::optional cookie; + ::std::int32_t typeId; + ::std::int16_t del; + std::optional<::std::int16_t> cookie; ::std::string ex; - int result; + ::std::int32_t result; ::std::string istr; ::std::string ostr; ::std::string inS; @@ -390,7 +390,7 @@ class Ex : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - Ex(short istr, int ostr) : + Ex(::std::int16_t istr, ::std::int32_t ostr) : istr(istr), ostr(ostr) { @@ -400,7 +400,7 @@ class Ex : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(istr, ostr); } @@ -411,8 +411,8 @@ class Ex : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - short istr; - int ostr; + ::std::int16_t istr; + ::std::int32_t ostr; }; /// \cond INTERNAL diff --git a/slice2cpp/swift/test/Slice/escape/Key.cpp b/slice2cpp/swift/test/Slice/escape/Key.cpp index 538ec4752cc4..1ab0fe3ee6b9 100644 --- a/slice2cpp/swift/test/Slice/escape/Key.cpp +++ b/slice2cpp/swift/test/Slice/escape/Key.cpp @@ -91,30 +91,30 @@ const ::IceInternal::DefaultUserExceptionFactoryInit<::_cpp_and::as> iceC_and_as } void -_cpp_and::breakPrx::_cpp_case(int iceP_catch, int& iceP_try, const ::Ice::Context& context) const +_cpp_and::breakPrx::_cpp_case(::std::int32_t iceP_catch, ::std::int32_t& iceP_try, const ::Ice::Context& context) const { - iceP_try = _makePromiseOutgoing(true, this, &breakPrx::_iceI_case, iceP_catch, context).get(); + iceP_try = _makePromiseOutgoing<::std::int32_t>(true, this, &breakPrx::_iceI_case, iceP_catch, context).get(); } -::std::future -_cpp_and::breakPrx::caseAsync(int iceP_catch, const ::Ice::Context& context) const +::std::future<::std::int32_t> +_cpp_and::breakPrx::caseAsync(::std::int32_t iceP_catch, const ::Ice::Context& context) const { - return _makePromiseOutgoing(false, this, &breakPrx::_iceI_case, iceP_catch, context); + return _makePromiseOutgoing<::std::int32_t, ::std::promise>(false, this, &breakPrx::_iceI_case, iceP_catch, context); } ::std::function -_cpp_and::breakPrx::caseAsync(int iceP_catch, - ::std::function response, +_cpp_and::breakPrx::caseAsync(::std::int32_t iceP_catch, + ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const { - return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, &_cpp_and::breakPrx::_iceI_case, iceP_catch, context); + return _makeLambdaOutgoing<::std::int32_t>(std::move(response), std::move(ex), std::move(sent), this, &_cpp_and::breakPrx::_iceI_case, iceP_catch, context); } /// \cond INTERNAL void -_cpp_and::breakPrx::_iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, int iceP_catch, const ::Ice::Context& context) const +_cpp_and::breakPrx::_iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>& outAsync, ::std::int32_t iceP_catch, const ::Ice::Context& context) const { _checkTwowayOnly(iceC_and_break_case_name); outAsync->invoke(iceC_and_break_case_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context, @@ -239,11 +239,11 @@ _cpp_and::_cpp_break::_iceD_case(::IceInternal::Incoming& inS, const ::Ice::Curr { _iceCheckMode(::Ice::OperationMode::Normal, current.mode); auto istr = inS.startReadParams(); - int iceP_catch; + ::std::int32_t iceP_catch; istr->readAll(iceP_catch); inS.endReadParams(); auto inA = ::IceInternal::IncomingAsync::create(inS); - auto responseCB = [inA](int iceP_try) + auto responseCB = [inA](::std::int32_t iceP_try) { auto ostr = inA->startWriteParams(); ostr->writeAll(iceP_try); diff --git a/slice2cpp/swift/test/Slice/escape/Key.h b/slice2cpp/swift/test/Slice/escape/Key.h index 364cc87aadf3..8bc8228a6a57 100644 --- a/slice2cpp/swift/test/Slice/escape/Key.h +++ b/slice2cpp/swift/test/Slice/escape/Key.h @@ -69,19 +69,19 @@ using _cpp_for = ::std::map<::std::string, guard>; * throws return, as; * } */ -constexpr int is = 0; +constexpr ::std::int32_t is = 0; -constexpr int self = 0; +constexpr ::std::int32_t self = 0; -constexpr int _cpp_throw = 0; +constexpr ::std::int32_t _cpp_throw = 0; -constexpr int typealias = 0; +constexpr ::std::int32_t typealias = 0; -constexpr int internal = 0; +constexpr ::std::int32_t internal = 0; -constexpr int _cpp_while = 0; +constexpr ::std::int32_t _cpp_while = 0; -constexpr int import = 0; +constexpr ::std::int32_t import = 0; } @@ -92,19 +92,19 @@ class breakPrx : public ::Ice::Proxy { public: - void _cpp_case(int _cpp_catch, int& _cpp_try, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + void _cpp_case(::std::int32_t _cpp_catch, ::std::int32_t& _cpp_try, const ::Ice::Context& context = ::Ice::noExplicitContext) const; - ::std::future caseAsync(int _cpp_catch, const ::Ice::Context& context = ::Ice::noExplicitContext)const; + ::std::future<::std::int32_t> caseAsync(::std::int32_t _cpp_catch, const ::Ice::Context& context = ::Ice::noExplicitContext)const; ::std::function - caseAsync(int _cpp_catch, - ::std::function response, + caseAsync(::std::int32_t _cpp_catch, + ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; /// \cond INTERNAL - void _iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, int, const ::Ice::Context&) const; + void _iceI_case(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::int32_t>>&, ::std::int32_t, const ::Ice::Context&) const; /// \endcond /** @@ -289,13 +289,13 @@ namespace _cpp_and struct guard { - int _cpp_default; + ::std::int32_t _cpp_default; /** * Obtains a tuple containing all of the struct's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(_cpp_default); } @@ -343,7 +343,7 @@ class _cpp_switch : public ::Ice::ValueHelper<_cpp_switch, ::Ice::Value> /** * One-shot constructor to initialize all data members. */ - _cpp_switch(int _cpp_if, const ::std::optional<::_cpp_and::funcPrx>& _cpp_export, int _cpp_volatile) : + _cpp_switch(::std::int32_t _cpp_if, const ::std::optional<::_cpp_and::funcPrx>& _cpp_export, ::std::int32_t _cpp_volatile) : _cpp_if(_cpp_if), _cpp_export(_cpp_export), _cpp_volatile(_cpp_volatile) @@ -354,7 +354,7 @@ class _cpp_switch : public ::Ice::ValueHelper<_cpp_switch, ::Ice::Value> * Obtains a tuple containing all of the value's data members. * @return The data members in a tuple. */ - std::tuple&, const int&> ice_tuple() const + std::tuple&, const ::std::int32_t&> ice_tuple() const { return std::tie(_cpp_if, _cpp_export, _cpp_volatile); } @@ -365,9 +365,9 @@ class _cpp_switch : public ::Ice::ValueHelper<_cpp_switch, ::Ice::Value> */ static const ::std::string& ice_staticId(); - int _cpp_if; + ::std::int32_t _cpp_if; ::std::optional<::_cpp_and::funcPrx> _cpp_export; - int _cpp_volatile; + ::std::int32_t _cpp_volatile; }; /// \cond INTERNAL @@ -392,7 +392,7 @@ class _cpp_return : public ::Ice::UserExceptionHelper<_cpp_return, ::Ice::UserEx /** * One-shot constructor to initialize all data members. */ - _cpp_return(int Int32) : + _cpp_return(::std::int32_t Int32) : Int32(Int32) { } @@ -401,7 +401,7 @@ class _cpp_return : public ::Ice::UserExceptionHelper<_cpp_return, ::Ice::UserEx * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(Int32); } @@ -412,7 +412,7 @@ class _cpp_return : public ::Ice::UserExceptionHelper<_cpp_return, ::Ice::UserEx */ static const ::std::string& ice_staticId(); - int Int32; + ::std::int32_t Int32; }; /// \cond INTERNAL @@ -432,7 +432,7 @@ class as : public ::Ice::UserExceptionHelper /** * One-shot constructor to initialize all data members. */ - as(int Int32, int _cpp_static, int _cpp_switch) : + as(::std::int32_t Int32, ::std::int32_t _cpp_static, ::std::int32_t _cpp_switch) : ::Ice::UserExceptionHelper(Int32), _cpp_static(_cpp_static), _cpp_switch(_cpp_switch) @@ -443,7 +443,7 @@ class as : public ::Ice::UserExceptionHelper * Obtains a tuple containing all of the exception's data members. * @return The data members in a tuple. */ - std::tuple ice_tuple() const + std::tuple ice_tuple() const { return std::tie(Int32, _cpp_static, _cpp_switch); } @@ -454,8 +454,8 @@ class as : public ::Ice::UserExceptionHelper */ static const ::std::string& ice_staticId(); - int _cpp_static; - int _cpp_switch; + ::std::int32_t _cpp_static; + ::std::int32_t _cpp_switch; }; } @@ -497,7 +497,7 @@ class _cpp_break : public virtual ::Ice::Object */ static const ::std::string& ice_staticId(); - virtual void caseAsync(int _cpp_catch, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; + virtual void caseAsync(::std::int32_t _cpp_catch, ::std::function response, ::std::function exception, const ::Ice::Current& current) = 0; /// \cond INTERNAL bool _iceD_case(::IceInternal::Incoming&, const ::Ice::Current&); /// \endcond diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs index 14cc1a9aad2c..c30c6de85dc0 100644 --- a/slice2cs/cpp/src/IceGrid/Internal.cs +++ b/slice2cs/cpp/src/IceGrid/Internal.cs @@ -7559,11 +7559,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl { throw ex; } - catch(AdapterExistsException) + catch(AdapterNotExistException) { throw; } - catch(AdapterNotExistException) + catch(AdapterExistsException) { throw; } diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs index b042be4ac78d..17b5b360dbdb 100644 --- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs @@ -13342,6 +13342,14 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); @@ -13372,14 +13380,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs index dc7a94e2ef22..79cce51c465e 100644 --- a/slice2cs/csharp/test/Ice/operations/Test.cs +++ b/slice2cs/csharp/test/Ice/operations/Test.cs @@ -17005,6 +17005,68 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); @@ -17085,68 +17147,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - - public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - #endregion #region Slice type-related members @@ -18070,6 +18070,68 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + 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, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); @@ -18150,68 +18212,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - 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, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs index b54245eed464..c64ac6d85c54 100644 --- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs @@ -13169,76 +13169,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); @@ -13311,6 +13241,76 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opVoidAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs index 0fdbce397441..4b1e81a0bfcc 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs @@ -16917,40 +16917,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract int[] opIntS(int[] s, global::Ice.Current current = null); - - public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17007,6 +16973,54 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract int[] opIntS(int[] s, global::Ice.Current current = null); + + public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); + + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); public abstract short opShort1(short opShort1, global::Ice.Current current = null); @@ -17045,20 +17059,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - #endregion #region Slice type-related members @@ -17563,40 +17563,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract int[] opIntS(int[] s, global::Ice.Current current = null); - - public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); - - public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); - - public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17653,6 +17619,54 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract int[] opIntS(int[] s, global::Ice.Current current = null); + + public abstract void opByteSOneway(byte[] s, global::Ice.Current current = null); + + public abstract int opByteSOnewayCallCount(global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opContext(global::Ice.Current current = null); + + public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); + + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); public abstract short opShort1(short opShort1, global::Ice.Current current = null); @@ -17691,20 +17705,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs index 6f047eb88807..70b547062afd 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 @@ -13140,6 +13140,74 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task> opContextAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opIdempotentAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opNonmutatingAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMStruct1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMSeq1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task shutdownAsync(global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task supportsCompressAsync(global::Ice.Current current = null); @@ -13214,74 +13282,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task> opContextAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opIdempotentAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opNonmutatingAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMStruct1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMSeq1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/js/test/Ice/exceptions/Test.cs b/slice2cs/js/test/Ice/exceptions/Test.cs index 9e032c74b128..e3441b75ebda 100644 --- a/slice2cs/js/test/Ice/exceptions/Test.cs +++ b/slice2cs/js/test/Ice/exceptions/Test.cs @@ -1299,11 +1299,11 @@ private void _iceI_throwAorDasAorD(int iceP_a, global::System.Collections.Generi { throw ex; } - catch(D) + catch(A) { throw; } - catch(A) + catch(D) { throw; } diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs index e28ccceb8bd6..3451aab1e9ee 100644 --- a/slice2cs/js/test/Ice/operations/Test.cs +++ b/slice2cs/js/test/Ice/operations/Test.cs @@ -17352,12 +17352,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); @@ -17494,6 +17488,12 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -18170,12 +18170,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); @@ -18312,6 +18306,12 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/matlab/test/Ice/inheritance/Test.cs b/slice2cs/matlab/test/Ice/inheritance/Test.cs index a2fc07b9a1b3..2b485ce05d22 100644 --- a/slice2cs/matlab/test/Ice/inheritance/Test.cs +++ b/slice2cs/matlab/test/Ice/inheritance/Test.cs @@ -2070,12 +2070,12 @@ public abstract class ICDisp_ : global::Ice.ObjectImpl, IC #region Inherited Slice operations - public abstract IAPrx iaop(IAPrx p, global::Ice.Current current = null); - public abstract global::Test.MB.IB1Prx ib1op(global::Test.MB.IB1Prx p, global::Ice.Current current = null); public abstract global::Test.MB.IB2Prx ib2op(global::Test.MB.IB2Prx p, global::Ice.Current current = null); + public abstract IAPrx iaop(IAPrx p, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/matlab/test/Ice/operations/Test.cs b/slice2cs/matlab/test/Ice/operations/Test.cs index 055e97f9137f..134eb52041c0 100644 --- a/slice2cs/matlab/test/Ice/operations/Test.cs +++ b/slice2cs/matlab/test/Ice/operations/Test.cs @@ -16862,34 +16862,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - - public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); @@ -17002,6 +16974,34 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17501,34 +17501,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); - - public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); @@ -17641,6 +17613,34 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); + + public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/php/test/Ice/operations/Test.cs b/slice2cs/php/test/Ice/operations/Test.cs index f97c401b88e4..f0b5a47eb177 100644 --- a/slice2cs/php/test/Ice/operations/Test.cs +++ b/slice2cs/php/test/Ice/operations/Test.cs @@ -15443,10 +15443,48 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); @@ -15533,44 +15571,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - - public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - #endregion #region Slice type-related members @@ -16040,10 +16040,48 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); + + public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); @@ -16130,44 +16168,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); - - public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs index cec578b99063..e134a36349fd 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -16883,58 +16883,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); - - public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); @@ -17025,6 +16973,58 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, global::Ice.Current current = null); + + public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17529,58 +17529,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations - public abstract void shutdown(global::Ice.Current current = null); - - public abstract bool supportsCompress(global::Ice.Current current = null); - - public abstract void opVoid(global::Ice.Current current = null); - - public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); - - public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); - - public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); - - public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); @@ -17671,6 +17619,58 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); + + public abstract bool supportsCompress(global::Ice.Current current = null); + + public abstract void opVoid(global::Ice.Current current = null); + + public abstract byte opByte(byte p1, byte p2, out byte p3, global::Ice.Current current = null); + + public abstract bool opBool(bool p1, bool p2, out bool p3, global::Ice.Current current = null); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, global::Ice.Current current = null); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, global::Ice.Current current = null); + + public abstract string opString(string p1, string p2, out string p3, global::Ice.Current current = null); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, global::Ice.Current current = null); + + public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, global::Ice.Current current = null); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, global::Ice.Current current = null); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, global::Ice.Current current = null); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, global::Ice.Current current = null); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, global::Ice.Current current = null); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, global::Ice.Current current = null); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, global::Ice.Current current = null); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, global::Ice.Current current = null); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, global::Ice.Current current = null); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs index d2e435e08ca0..e232c181c359 100644 --- a/slice2cs/ruby/test/Ice/operations/Test.cs +++ b/slice2cs/ruby/test/Ice/operations/Test.cs @@ -16549,16 +16549,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClassPrx opMyClass(MyClassPrx p1, out MyClassPrx p2, out MyClassPrx p3, global::Ice.Current current = null); - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, global::Ice.Current current = null); public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); @@ -16667,6 +16657,16 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, global::Ice.Current current = null); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + #endregion #region Slice type-related members @@ -17181,16 +17181,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClassPrx opMyClass(global::Test.MyClassPrx p1, out global::Test.MyClassPrx p2, out global::Test.MyClassPrx p3, global::Ice.Current current = null); - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); - - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, global::Ice.Current current = null); public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, global::Ice.Current current = null); @@ -17299,6 +17289,16 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(global::Ice.Current current = null); + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(global::Ice.Current current = null); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + #endregion #region Slice type-related members diff --git a/slice2cs/slice/Glacier2/Router.cs b/slice2cs/slice/Glacier2/Router.cs index 2d4e98daddd5..43cbff3618a9 100644 --- a/slice2cs/slice/Glacier2/Router.cs +++ b/slice2cs/slice/Glacier2/Router.cs @@ -683,11 +683,11 @@ private void _iceI_createSession(string iceP_userId, string iceP_password, globa { throw ex; } - catch(PermissionDeniedException) + catch(CannotCreateSessionException) { throw; } - catch(CannotCreateSessionException) + catch(PermissionDeniedException) { throw; } @@ -733,11 +733,11 @@ private void _iceI_createSessionFromSecureConnection(global::System.Collections. { throw ex; } - catch(PermissionDeniedException) + catch(CannotCreateSessionException) { throw; } - catch(CannotCreateSessionException) + catch(PermissionDeniedException) { throw; } diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs index b2370791a8f5..e38a4e6dcde2 100644 --- a/slice2cs/swift/test/Ice/operations/Test.cs +++ b/slice2cs/swift/test/Ice/operations/Test.cs @@ -17184,6 +17184,32 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla #region Inherited Slice operations + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + + public abstract short opShort1(short opShort1, global::Ice.Current current = null); + + public abstract int opInt1(int opInt1, global::Ice.Current current = null); + + public abstract long opLong1(long opLong1, global::Ice.Current current = null); + + public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); + + public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); + + public abstract string opString1(string opString1, global::Ice.Current current = null); + + public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17284,32 +17310,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - - public abstract short opShort1(short opShort1, global::Ice.Current current = null); - - public abstract int opInt1(int opInt1, global::Ice.Current current = null); - - public abstract long opLong1(long opLong1, global::Ice.Current current = null); - - public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); - - public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); - - public abstract string opString1(string opString1, global::Ice.Current current = null); - - public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - public abstract string[] opStringLiterals(global::Ice.Current current = null); public abstract string[] opWStringLiterals(global::Ice.Current current = null); @@ -17830,6 +17830,32 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla { #region Inherited Slice operations + public abstract void opIdempotent(global::Ice.Current current = null); + + public abstract void opNonmutating(global::Ice.Current current = null); + + public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); + + public abstract short opShort1(short opShort1, global::Ice.Current current = null); + + public abstract int opInt1(int opInt1, global::Ice.Current current = null); + + public abstract long opLong1(long opLong1, global::Ice.Current current = null); + + public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); + + public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); + + public abstract string opString1(string opString1, global::Ice.Current current = null); + + public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + public abstract void shutdown(global::Ice.Current current = null); public abstract bool supportsCompress(global::Ice.Current current = null); @@ -17930,32 +17956,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract void opDoubleMarshaling(double p1, double[] p2, global::Ice.Current current = null); - public abstract void opIdempotent(global::Ice.Current current = null); - - public abstract void opNonmutating(global::Ice.Current current = null); - - public abstract byte opByte1(byte opByte1, global::Ice.Current current = null); - - public abstract short opShort1(short opShort1, global::Ice.Current current = null); - - public abstract int opInt1(int opInt1, global::Ice.Current current = null); - - public abstract long opLong1(long opLong1, global::Ice.Current current = null); - - public abstract float opFloat1(float opFloat1, global::Ice.Current current = null); - - public abstract double opDouble1(double opDouble1, global::Ice.Current current = null); - - public abstract string opString1(string opString1, global::Ice.Current current = null); - - public abstract string[] opStringS1(string[] opStringS1, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract string[] opStringS2(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - public abstract string[] opStringLiterals(global::Ice.Current current = null); public abstract string[] opWStringLiterals(global::Ice.Current current = null); diff --git a/slice2cs/swift/test/Ice/operations/TestAMD.cs b/slice2cs/swift/test/Ice/operations/TestAMD.cs index cf1072b890ab..1be2378bbbe8 100644 --- a/slice2cs/swift/test/Ice/operations/TestAMD.cs +++ b/slice2cs/swift/test/Ice/operations/TestAMD.cs @@ -13178,6 +13178,8 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, global::Ice.Current current = null); @@ -13212,6 +13214,30 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMStruct1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMSeq1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); + + public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); + public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); @@ -13222,8 +13248,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, global::Ice.Current current = null); @@ -13258,30 +13282,6 @@ public abstract class MyDerivedClassDisp_ : global::Ice.ObjectImpl, MyDerivedCla public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, global::Ice.Current current = null); - public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMStruct1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMSeq1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMSeq2Async(string[] p1, global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict1Async(global::Ice.Current current = null); - - public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, global::Ice.Current current = null); - #endregion #region Slice type-related members diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java index 41906b357049..c71a31cf541a 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3774318845734161410L; + public static final long serialVersionUID = 3774327284176379140L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index 15ee7450b777..7c9d25d75da7 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7872705312734122974L; + public static final long serialVersionUID = 7872708125546759512L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index 857607e08d7d..9d88986c8809 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8251826444452794797L; + public static final long serialVersionUID = -3493389163985228845L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index 07181ad5a8c1..bb2d09f08e5b 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5925125951713312627L; + public static final long serialVersionUID = 8783054373928132237L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java index 227c54a07a26..bd87822000b8 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDistributionDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1760304221760003224L; + public static final long serialVersionUID = -7693853441940872792L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index 87bde153b380..6c1d21cda1b9 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java @@ -100,7 +100,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1877391030938743419L; + public static final long serialVersionUID = -1125665653237465285L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java index a0761e8d4317..d2f6ed04322b 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java @@ -133,8 +133,8 @@ public void read(com.zeroc.Ice.InputStream istr) * @throws NodeActiveException Raised if the node is already registered and currently active. **/ NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGrid.LoadInfo loadInf, com.zeroc.Ice.Current current) - throws NodeActiveException, - com.zeroc.IceGrid.PermissionDeniedException; + throws com.zeroc.IceGrid.PermissionDeniedException, + NodeActiveException; /** * Register a replica with the registry. If a replica with the same name is already registered, [registerReplica] @@ -146,8 +146,8 @@ NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGri * @throws ReplicaActiveException Raised if the replica is already registered and currently active. **/ ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegistryPrx prx, com.zeroc.Ice.Current current) - throws ReplicaActiveException, - com.zeroc.IceGrid.PermissionDeniedException; + throws com.zeroc.IceGrid.PermissionDeniedException, + ReplicaActiveException; /** * Create a session with the given registry replica. This method returns only once the session creation has been diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java index 334e192110e1..40cbfb17bfd1 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java @@ -27,8 +27,8 @@ public interface InternalRegistryPrx extends FileReaderPrx * @throws NodeActiveException Raised if the node is already registered and currently active. **/ default NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGrid.LoadInfo loadInf) - throws NodeActiveException, - com.zeroc.IceGrid.PermissionDeniedException + throws com.zeroc.IceGrid.PermissionDeniedException, + NodeActiveException { return registerNode(info, prx, loadInf, com.zeroc.Ice.ObjectPrx.noExplicitContext); } @@ -44,18 +44,18 @@ default NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zero * @throws NodeActiveException Raised if the node is already registered and currently active. **/ default NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGrid.LoadInfo loadInf, java.util.Map context) - throws NodeActiveException, - com.zeroc.IceGrid.PermissionDeniedException + throws com.zeroc.IceGrid.PermissionDeniedException, + NodeActiveException { try { return _iceI_registerNodeAsync(info, prx, loadInf, context, true).waitForResponseOrUserEx(); } - catch(NodeActiveException ex) + catch(com.zeroc.IceGrid.PermissionDeniedException ex) { throw ex; } - catch(com.zeroc.IceGrid.PermissionDeniedException ex) + catch(NodeActiveException ex) { throw ex; } @@ -120,8 +120,8 @@ default com.zeroc.IceInternal.OutgoingAsync _iceI_registerNodeAs /** @hidden */ static final Class[] _iceE_registerNode = { - NodeActiveException.class, - com.zeroc.IceGrid.PermissionDeniedException.class + com.zeroc.IceGrid.PermissionDeniedException.class, + NodeActiveException.class }; /** @@ -133,8 +133,8 @@ default com.zeroc.IceInternal.OutgoingAsync _iceI_registerNodeAs * @throws ReplicaActiveException Raised if the replica is already registered and currently active. **/ default ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegistryPrx prx) - throws ReplicaActiveException, - com.zeroc.IceGrid.PermissionDeniedException + throws com.zeroc.IceGrid.PermissionDeniedException, + ReplicaActiveException { return registerReplica(info, prx, com.zeroc.Ice.ObjectPrx.noExplicitContext); } @@ -149,18 +149,18 @@ default ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegi * @throws ReplicaActiveException Raised if the replica is already registered and currently active. **/ default ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegistryPrx prx, java.util.Map context) - throws ReplicaActiveException, - com.zeroc.IceGrid.PermissionDeniedException + throws com.zeroc.IceGrid.PermissionDeniedException, + ReplicaActiveException { try { return _iceI_registerReplicaAsync(info, prx, context, true).waitForResponseOrUserEx(); } - catch(ReplicaActiveException ex) + catch(com.zeroc.IceGrid.PermissionDeniedException ex) { throw ex; } - catch(com.zeroc.IceGrid.PermissionDeniedException ex) + catch(ReplicaActiveException ex) { throw ex; } @@ -221,8 +221,8 @@ default com.zeroc.IceInternal.OutgoingAsync _iceI_registerRep /** @hidden */ static final Class[] _iceE_registerReplica = { - ReplicaActiveException.class, - com.zeroc.IceGrid.PermissionDeniedException.class + com.zeroc.IceGrid.PermissionDeniedException.class, + ReplicaActiveException.class }; /** diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index 37b837920216..7e3271ae833c 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6171011083914774204L; + public static final long serialVersionUID = -8104264022179734084L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index 303a7f2b7dea..bec49e38507e 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java @@ -286,7 +286,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1056957880306241623L; + public static final long serialVersionUID = -3846534209571312638L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/ReplicaSession.java b/slice2java/cpp/src/IceGrid/IceGrid/ReplicaSession.java index 46a94b03b5ca..1fe1db037417 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/ReplicaSession.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/ReplicaSession.java @@ -56,8 +56,8 @@ void setDatabaseObserver(DatabaseObserverPrx dbObs, java.util.Optional _iceI_registerWellKnownObjects * with the locator registry interface. **/ default void setAdapterDirectProxy(String adapterId, String replicaGroupId, com.zeroc.Ice.ObjectPrx proxy) - throws AdapterExistsException, - com.zeroc.IceGrid.AdapterNotExistException + throws com.zeroc.IceGrid.AdapterNotExistException, + AdapterExistsException { setAdapterDirectProxy(adapterId, replicaGroupId, proxy, com.zeroc.Ice.ObjectPrx.noExplicitContext); } @@ -397,18 +397,18 @@ default void setAdapterDirectProxy(String adapterId, String replicaGroupId, com. * @param context The Context map to send with the invocation. **/ default void setAdapterDirectProxy(String adapterId, String replicaGroupId, com.zeroc.Ice.ObjectPrx proxy, java.util.Map context) - throws AdapterExistsException, - com.zeroc.IceGrid.AdapterNotExistException + throws com.zeroc.IceGrid.AdapterNotExistException, + AdapterExistsException { try { _iceI_setAdapterDirectProxyAsync(adapterId, replicaGroupId, proxy, context, true).waitForResponseOrUserEx(); } - catch(AdapterExistsException ex) + catch(com.zeroc.IceGrid.AdapterNotExistException ex) { throw ex; } - catch(com.zeroc.IceGrid.AdapterNotExistException ex) + catch(AdapterExistsException ex) { throw ex; } @@ -462,8 +462,8 @@ default com.zeroc.IceInternal.OutgoingAsync _iceI_setAdapterDirectProxyAsy /** @hidden */ static final Class[] _iceE_setAdapterDirectProxy = { - AdapterExistsException.class, - com.zeroc.IceGrid.AdapterNotExistException.class + com.zeroc.IceGrid.AdapterNotExistException.class, + AdapterExistsException.class }; /** diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index 2ec65a4159f2..2026d4afaba1 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - public static final long serialVersionUID = -6692611264439036549L; + public static final long serialVersionUID = 8530899045763324859L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index 70423fdc66d1..1b9644f8e340 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java @@ -195,5 +195,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final EventData _nullMarshalValue = new EventData(); /** @hidden */ - public static final long serialVersionUID = -4302780198643597054L; + public static final long serialVersionUID = 7631835455998473760L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 0e54e3e35179..ecfc3ba4122e 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java @@ -177,5 +177,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LinkRecord _nullMarshalValue = new LinkRecord(); /** @hidden */ - public static final long serialVersionUID = 8046546861093915288L; + public static final long serialVersionUID = 3506312449583215704L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index a235bc92fc7e..a84af447b32b 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final SubscriberRecord _nullMarshalValue = new SubscriberRecord(); /** @hidden */ - public static final long serialVersionUID = 113580544884833168L; + public static final long serialVersionUID = 5025628028711482240L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index f88dd8cedc94..c06400d0a4fe 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inp private static final SubscriberRecordKey _nullMarshalValue = new SubscriberRecordKey(); /** @hidden */ - public static final long serialVersionUID = -685182578743412513L; + public static final long serialVersionUID = -1567241442377785249L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index 42cc7e536ad3..d6f04c251402 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final GroupInfo _nullMarshalValue = new GroupInfo(); /** @hidden */ - public static final long serialVersionUID = -5493898050469865727L; + public static final long serialVersionUID = -751261040527786856L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index 110b9bfe86f6..35bfacbdc444 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java @@ -157,5 +157,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final LogUpdate _nullMarshalValue = new LogUpdate(); /** @hidden */ - public static final long serialVersionUID = 7263323904883267844L; + public static final long serialVersionUID = 6032701035874420900L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index a499c2e7e36d..aedac7794e3b 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - public static final long serialVersionUID = -6346995008270962742L; + public static final long serialVersionUID = -7420406110513726941L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index 1b17a3936fc9..015e7a9e0970 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 938911756956793233L; + public static final long serialVersionUID = 938918983907246155L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index abdbfde9a0b9..6180fb6496e3 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java @@ -231,5 +231,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final QueryInfo _nullMarshalValue = new QueryInfo(); /** @hidden */ - public static final long serialVersionUID = -2886034723391006137L; + public static final long serialVersionUID = 5258714700521255852L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index aaee47d363be..dad6b5c11ff7 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java @@ -162,5 +162,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final TopicContent _nullMarshalValue = new TopicContent(); /** @hidden */ - public static final long serialVersionUID = -1209517081560905748L; + public static final long serialVersionUID = -4759583287569471224L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index b16cdc86165d..8bc3228f2395 100644 --- a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java +++ b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - public static final long serialVersionUID = -773701340747531578L; + public static final long serialVersionUID = 1038960384928170676L; } diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index 667e0ebf0a8d..9f6ffc5cb458 100644 --- a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java +++ b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java @@ -201,5 +201,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TestToken _nullMarshalValue = new TestToken(); /** @hidden */ - public static final long serialVersionUID = 1361190345731928852L; + public static final long serialVersionUID = 8485853873771645733L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index cfb693d9c584..72db4fd3da40 100644 --- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3485099812009294735L; + public static final long serialVersionUID = -6822214488984095122L; } diff --git a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java index 70d0655e5dcd..ba084635f496 100644 --- a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4549597995892866632L; + public static final long serialVersionUID = 6766308950386146753L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index 5c645e9a0967..370e52369e72 100644 --- a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final BufferStruct _nullMarshalValue = new BufferStruct(); /** @hidden */ - public static final long serialVersionUID = 8199940223494681977L; + public static final long serialVersionUID = -9167554783530766105L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java b/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java index bdb0c2d71b49..e49442eedfb4 100644 --- a/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/ClassOtherStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final ClassOtherStruct _nullMarshalValue = new ClassOtherStruct(); /** @hidden */ - public static final long serialVersionUID = 2624124753645746077L; + public static final long serialVersionUID = 2624125994828128963L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java b/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java index 8c9f97b9bba6..eab89777f7d8 100644 --- a/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/ClassStruct.java @@ -163,5 +163,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - public static final long serialVersionUID = 3317159841249263365L; + public static final long serialVersionUID = -922020050270350693L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index 72a5e0fb179f..de5a0734f682 100644 --- a/slice2java/cpp/test/Ice/custom/Test/DictClass.java +++ b/slice2java/cpp/test/Ice/custom/Test/DictClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6545925406153870201L; + public static final long serialVersionUID = 6545927290338576679L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index 4144988af837..0b7b361a789b 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Fixed.java +++ b/slice2java/cpp/test/Ice/custom/Test/Fixed.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Fixed _nullMarshalValue = new Fixed(); /** @hidden */ - public static final long serialVersionUID = -5072317722926809503L; + public static final long serialVersionUID = -5072322102198490689L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index 1c0668f688b1..38a93a44b4ec 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Variable.java +++ b/slice2java/cpp/test/Ice/custom/Test/Variable.java @@ -163,5 +163,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Variable _nullMarshalValue = new Variable(); /** @hidden */ - public static final long serialVersionUID = -6592643126892836713L; + public static final long serialVersionUID = -8420560449265091383L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index 236b44c406ac..27bb47765e8a 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1345714716650749228L; + public static final long serialVersionUID = 1345716719807608244L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index c104301b4dbe..8de54d69a99d 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - public static final long serialVersionUID = -6616027545757615557L; + public static final long serialVersionUID = -6616029548895533661L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index 6995c80cdabc..0f51968b1143 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4583039537346186991L; + public static final long serialVersionUID = 4583044350737346551L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index 0e2207f9a1b5..8a9683502b3d 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - public static final long serialVersionUID = 5997325363130483960L; + public static final long serialVersionUID = 5997320549758265312L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index 7f0ee2e03649..8ce52a88bf11 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8766246014031437494L; + public static final long serialVersionUID = 1833005446417758958L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index c9918bf85cb2..7862e36cf2bd 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1592338442511465598L; + public static final long serialVersionUID = -9054785457368771302L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index 3f1d9033b949..1570a37f9d5a 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4372646898750970983L; + public static final long serialVersionUID = 3829850471301304494L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index 0958739f5420..b2b03d3f2b2c 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4983587129597687598L; + public static final long serialVersionUID = 136000450396842521L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index bc6b14ea1bfe..95ed86b19926 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = -4158192255855703661L; + public static final long serialVersionUID = -3562867649451603488L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index 8c32e2da2cd1..8c5722e87b4a 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = 4115415795705989530L; + public static final long serialVersionUID = -2804703840061091699L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index 22a0343f500e..386b952c4cc8 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - public static final long serialVersionUID = 1614755886972307985L; + public static final long serialVersionUID = -2195227544369786398L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index 58b8727db039..0b5d85a09383 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823740451864005083L; + public static final long serialVersionUID = 7823746849895953821L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index a43b2f9c2e64..359432bf5f0b 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/B.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861420901808572261L; + public static final long serialVersionUID = -3861409213772163747L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index d390f86faeaf..5bb478d1377a 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/C.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080694143066790363L; + public static final long serialVersionUID = 1080700541098739101L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index 8ee8e92db30a..c636f8505c57 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/D.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780371366293505947L; + public static final long serialVersionUID = 4780383054329914461L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index bf1f3cc121e7..417b38c78ce0 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/E.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1876979498774810025L; + public static final long serialVersionUID = -1876972103928078058L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index 846bad20a162..2838126ce1ab 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/F.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 733469355880897364L; + public static final long serialVersionUID = 733479803771914901L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index 40143fd84d0b..31a20428abd6 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641408786737186737L; + public static final long serialVersionUID = -4641412296892380407L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index eca6834f1eff..d3547fe666e5 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954229670532759355L; + public static final long serialVersionUID = 954229426371261797L; /** @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 15c9d20d6aaf..52ccda63e608 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1339633218804184737L; + public static final long serialVersionUID = 1339633134785052031L; /** @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 eed27e784eb6..45bb7917f71f 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2729306902335852893L; + public static final long serialVersionUID = -2729307146497301251L; /** @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 ef3092fe3588..30f0cbe34fdb 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3435398960804874331L; + public static final long serialVersionUID = -3435398724530175877L; /** @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 9ab82a6a259d..747e5c7bb6c6 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -836181220468065796L; + public static final long serialVersionUID = -836180976610213214L; /** @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 fa10ff4113ea..371d51f2696a 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1132522016153507777L; + public static final long serialVersionUID = 1132521937139244575L; /** @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 e47403bed103..b4e1bea70d47 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6335555745140496957L; + public static final long serialVersionUID = -6335555984297075811L; /** @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 8f3b1ffd4e5a..b071ba22f383 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4007410667074091067L; + public static final long serialVersionUID = -4007410425794523109L; /** @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 f094fa573248..8e6a69aa5272 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 991428633346748477L; + public static final long serialVersionUID = 991428869621397731L; /** @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 37c33a4e2538..f9f236bac598 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2880334728324762143L; + public static final long serialVersionUID = -2880334812040159937L; /** @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 4198a746e999..aa62d95457e3 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8808268064858223133L; + public static final long serialVersionUID = -8808268308715936579L; /** @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 acb466047b01..77e1ca03c63c 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -771853707376375835L; + public static final long serialVersionUID = -771853470797942469L; /** @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 83dcab87f21f..dad510a860a4 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6566354665835127038L; + public static final long serialVersionUID = 6566354749550663968L; /** @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 c2ed34dc5ebd..e2a8f9a5c542 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6983798930978403329L; + public static final long serialVersionUID = 6983798852267596767L; /** @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 381066955aea..a5d8aaa8ec52 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1175219924679293181L; + public static final long serialVersionUID = -1175220163532415395L; /** @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 0c3eff21d2d4..16c98c52330c 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3279718965266172155L; + public static final long serialVersionUID = -3279718723683147557L; /** @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 44d2f773e0fa..2b104f3b7b9a 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4359171739869317569L; + public static final long serialVersionUID = -4359171663736983967L; /** @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 ffac028ccc08..d00e524e5bd8 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5904690006355572769L; + public static final long serialVersionUID = 5904689922336440063L; /** @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 927a10dd84dd..a8767862c42b 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1835749885215535139L; + public static final long serialVersionUID = 1835749641054086781L; /** @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 f223fba6cb82..159b7dc5f9a8 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2252399614035191515L; + public static final long serialVersionUID = -2252399377760493061L; /** @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 2139994ea467..a014299038e1 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1203539653112537872L; + public static final long serialVersionUID = -1203539729548500050L; /** @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 98aa08b59894..026b3a4bfb76 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7537770015433777343L; + public static final long serialVersionUID = -7537770094448040545L; /** @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 807cac44c528..d16afb01655f 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3440896296981769539L; + public static final long serialVersionUID = 3440896057825190685L; /** @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 2a99af21f8c0..988f76743b2c 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9151098815829880645L; + public static final long serialVersionUID = 9151099057109448603L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java index 164542fce66b..f11d1c018d5b 100644 --- a/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/cpp/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742723599410581671L; + public static final long serialVersionUID = -8742722821934655227L; } diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index c0a304da399d..79077a0aac56 100644 --- a/slice2java/cpp/test/Ice/library/Test/UserError.java +++ b/slice2java/cpp/test/Ice/library/Test/UserError.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126956713118529822L; + public static final long serialVersionUID = -1126960900205279721L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index d29f38673463..506e06104055 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4134572872320558068L; + public static final long serialVersionUID = 7221953417073163141L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index fba14e009e64..c56b5f808f69 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A1.java +++ b/slice2java/cpp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926738801814653036L; + public static final long serialVersionUID = -5926744158821345692L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index bec8dc2c114f..1a12a0ed6263 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890911854415953308L; + public static final long serialVersionUID = -8890915163263288003L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index e57d1322b307..0777b0ff61d7 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B1.java +++ b/slice2java/cpp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1030912493443711740L; + public static final long serialVersionUID = 7745474108945015940L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index ce0e094eaa89..bd92123dca28 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Base.java +++ b/slice2java/cpp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3795474371458513364L; + public static final long serialVersionUID = 7272565810447711636L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 46f7e45e1b41..8ff34114c4cc 100644 --- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3897776192889456582L; + public static final long serialVersionUID = 3897767077862906934L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index c10d97c046b3..82c097900c30 100644 --- a/slice2java/cpp/test/Ice/objects/Test/C.java +++ b/slice2java/cpp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7251233482468135914L; + public static final long serialVersionUID = -3043409098110806866L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index e4687e725ca4..6a1002e7bbf4 100644 --- a/slice2java/cpp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050965250196754220L; + public static final long serialVersionUID = 3050979469418095175L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index 46a46e3e03c8..469af5307982 100644 --- a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -506440978925473765L; + public static final long serialVersionUID = -9021532594088313253L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index b8460a557e9c..ad60aeb8a594 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D.java +++ b/slice2java/cpp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5958840639280439284L; + public static final long serialVersionUID = 1445797016204447932L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index 39756b42b00e..6818ea165e22 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4019069877864403523L; + public static final long serialVersionUID = -4362604001003516989L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index 75a65af29f90..b9c31c762138 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Derived.java +++ b/slice2java/cpp/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1587931109547315583L; + public static final long serialVersionUID = -1587931950368945624L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index f42b8b7583e0..a80c800d9b7e 100644 --- a/slice2java/cpp/test/Ice/objects/Test/E.java +++ b/slice2java/cpp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8339806473205179315L; + public static final long serialVersionUID = -3292407664591469150L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index 68ef7a8e1a90..a7a77376be8f 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EBase.java +++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6306099967591747790L; + public static final long serialVersionUID = -4448165546945302962L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index 6d8ae9e01206..9968f393ba11 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4491223861686787374L; + public static final long serialVersionUID = 3074268890037982546L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index ed3637e7c34c..8c14794c4be8 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225280393684788765L; + public static final long serialVersionUID = -6225290188336835128L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index 9f8cd339bc97..91c67c234693 100644 --- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -4237668065519965036L; + public static final long serialVersionUID = -2274040267172480044L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index 1b145110f63b..cd979d4ee2ea 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F.java +++ b/slice2java/cpp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8558899432396820305L; + public static final long serialVersionUID = 9143095567684153553L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index fbae83454ec4..0d33d739ba1d 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F1.java +++ b/slice2java/cpp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192373545586531924L; + public static final long serialVersionUID = 6192372079861073001L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index 38f85be69478..5a19b853e900 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F3.java +++ b/slice2java/cpp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6673601020240639179L; + public static final long serialVersionUID = 7261185255765722672L; /** @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 b5826d16ee0e..d3150ead26b0 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425253794557908466L; + public static final long serialVersionUID = -1425257790148666281L; /** @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 f6bcac87ffd2..3704a6248dde 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337225281397801043L; + public static final long serialVersionUID = -2337226035627303459L; } 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 f4b9baf089d1..573b5ddb7a03 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298688719282645939L; + public static final long serialVersionUID = -1298676029369872708L; /** @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 9ff75b5a3921..660ca1188c02 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842225657406445257L; + public static final long serialVersionUID = 1842241919720331129L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index 7ed9fe33d2b1..4da343411faf 100644 --- a/slice2java/cpp/test/Ice/objects/Test/K.java +++ b/slice2java/cpp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645160894717249360L; + public static final long serialVersionUID = 4645159784284998643L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index 02e0d5963c07..0ececb7f591c 100644 --- a/slice2java/cpp/test/Ice/objects/Test/L.java +++ b/slice2java/cpp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629743198780636383L; + public static final long serialVersionUID = 6629735963964586351L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index 70f429bb1665..4b7cbdab0acb 100644 --- a/slice2java/cpp/test/Ice/objects/Test/M.java +++ b/slice2java/cpp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088102003619779305L; + public static final long serialVersionUID = -8088100572895588565L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index 68271d34f827..b831b27ccd3d 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/cpp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617887208235359926L; + public static final long serialVersionUID = 3617875549084795689L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index d4b4f458aeb9..33b9a7efacb8 100644 --- a/slice2java/cpp/test/Ice/objects/Test/S.java +++ b/slice2java/cpp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481773042313981804L; + public static final long serialVersionUID = 481769728390366812L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index ce77e5690d37..790709f554bc 100644 --- a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227748582680039925L; + public static final long serialVersionUID = 6227751375140094686L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index 651d2943c456..41c03d46b333 100644 --- a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = 3249132816766427138L; + public static final long serialVersionUID = -3622910762203731134L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index 46a9f981c598..43c628afa4f9 100644 --- a/slice2java/cpp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/cpp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = -2094646888368051073L; + public static final long serialVersionUID = 6950903275560089582L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index 9afe200b8482..ce1c9957acde 100644 --- a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723843858863674328L; + public static final long serialVersionUID = 2723847576918789939L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index 8d89857ed737..c9261047bc76 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4028174850402105260L; + public static final long serialVersionUID = 2604630451943762559L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index ce4c2e9650b4..0780e5efa253 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 1490250176388328221L; + public static final long serialVersionUID = -4573845345904533603L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 9417ff6ac763..134ed6b81bec 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = 266042142726649509L; + public static final long serialVersionUID = -4472123886209779338L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index 623f673523a9..7a2009c57eaa 100644 --- a/slice2java/cpp/test/Ice/operations/Test/Structure.java +++ b/slice2java/cpp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = 3683949805539400386L; + public static final long serialVersionUID = 5611671820057553182L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index ba8b4dbf4de1..853bdd3f2bda 100644 --- a/slice2java/cpp/test/Ice/optional/Test/A.java +++ b/slice2java/cpp/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8473377953386483952L; + public static final long serialVersionUID = -8564004780517909872L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index 16c8525d463d..b824088fdbd9 100644 --- a/slice2java/cpp/test/Ice/optional/Test/B.java +++ b/slice2java/cpp/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1742466089611637341L; + public static final long serialVersionUID = 6684556416741275491L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index 5718cd0df41d..d3156f3b6ae7 100644 --- a/slice2java/cpp/test/Ice/optional/Test/C.java +++ b/slice2java/cpp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 106890890904611133L; + public static final long serialVersionUID = 2017421152279654525L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java index 0c962148b7fd..3020a8ae56a3 100644 --- a/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4360001545956081203L; + public static final long serialVersionUID = 4359994440294622310L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index f0a1f4682258..d5df3f5aeda7 100644 --- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -9027234074949404589L; + public static final long serialVersionUID = -6308139260773527434L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index a84f01207dda..bfa643b8f236 100644 --- a/slice2java/cpp/test/Ice/optional/Test/E.java +++ b/slice2java/cpp/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399092984890072980L; + public static final long serialVersionUID = 4399099930409167473L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index fb7df6edefb3..f857c08bb72a 100644 --- a/slice2java/cpp/test/Ice/optional/Test/F.java +++ b/slice2java/cpp/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111939374190007591L; + public static final long serialVersionUID = 2111949124768546498L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index b88c145b1d9e..74001f25f47e 100644 --- a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569609719540702594L; + public static final long serialVersionUID = 1569605424122774743L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index 5687993b7bca..b74a5d5f825b 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G.java +++ b/slice2java/cpp/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -338117399094430701L; + public static final long serialVersionUID = -624902422683429229L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index 1072efd8eea9..7698d08e7284 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G1.java +++ b/slice2java/cpp/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356160808076322859L; + public static final long serialVersionUID = -356164943347361788L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index c2c8ec4aaa05..d6e2b867bd7d 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G2.java +++ b/slice2java/cpp/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44040292623313839L; + public static final long serialVersionUID = 44033186961845000L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index 5f4fba2be58b..72c9f57547ff 100644 --- a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -297352349095753406L; + public static final long serialVersionUID = 299718064645925568L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index 7930075beab2..48c4da2fe7b6 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219607564234241236L; + public static final long serialVersionUID = -7219600458572921479L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index 85877f3ea5f7..40e776b9de29 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 9164769540450418312L; + public static final long serialVersionUID = -1463708837193753312L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index 5382ce71be47..a453855c7d2d 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2504972197151046030L; + public static final long serialVersionUID = 7277589318025533417L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/Recursive.java b/slice2java/cpp/test/Ice/optional/Test/Recursive.java index a75429501778..8a1feaef9866 100644 --- a/slice2java/cpp/test/Ice/optional/Test/Recursive.java +++ b/slice2java/cpp/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055416815898140123L; + public static final long serialVersionUID = 9055423761412624050L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 0d413cfd27c4..12bf609f0572 100644 --- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -4561600318306095404L; + public static final long serialVersionUID = 421114821031425777L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index 75c818e24936..37fb426c97d5 100644 --- a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700996253024616218L; + public static final long serialVersionUID = 6700983692211616354L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index c19de8c87be9..0028fb44d633 100644 --- a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912281358405836044L; + public static final long serialVersionUID = -1912288303911177691L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index 9f956e8687d1..2e07dd3b65b2 100644 --- a/slice2java/cpp/test/Ice/optional/Test/WD.java +++ b/slice2java/cpp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6297950911170288592L; + public static final long serialVersionUID = -1935173357439419468L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index 43432026d09f..ecd27911d435 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190251422020335757L; + public static final long serialVersionUID = -5190251999384719054L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index f08cf91c352a..2a5150c96928 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C1.java +++ b/slice2java/cpp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893231869111227408L; + public static final long serialVersionUID = 8893237901636377105L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index e557aeb3353c..d7828beb7e47 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C2.java +++ b/slice2java/cpp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3203312273541105678L; + public static final long serialVersionUID = -7765717693611088717L; /** @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 81eea6525aa8..52bffd409a57 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615629634383404021L; + public static final long serialVersionUID = 4615624919158091892L; /** @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 b22ec5010014..c6b14f719088 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672584898062124880L; + public static final long serialVersionUID = 672596383314539665L; /** @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 5a661777f2c8..685c3fe64341 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654440765444707916L; + public static final long serialVersionUID = 8654434567611651789L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index 53588afffecb..9bf352e21e6d 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694611836812424320L; + public static final long serialVersionUID = 3694622169769371393L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index a5fe4f790844..642c6ec2af77 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159709530404703358L; + public static final long serialVersionUID = 2159704815338021375L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index 235ded813ea8..a4e095fd1044 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S1.java +++ b/slice2java/cpp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241676401513587881L; + public static final long serialVersionUID = 1241675653836504616L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index f8e4936e22cb..fa14cada375f 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S2.java +++ b/slice2java/cpp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -7071879456665558389L; + public static final long serialVersionUID = 3957800460147697226L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index d9f8e905d508..fb3145333a6e 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023082667981276L; + public static final long serialVersionUID = -477021350890332236L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java index 8b1341089563..d82b1abe2c06 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435630433627213472L; + public static final long serialVersionUID = -8435645232644167568L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 33f164342864..91232b5b73d2 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485209532627291330L; + public static final long serialVersionUID = 3485211254229881938L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index e57a9d49c682..5523ffbaff62 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377360907641395L; + public static final long serialVersionUID = 1717374947235479715L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 918872ec802e..e5217f751b94 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384912376938338006L; + public static final long serialVersionUID = -7384920878757906502L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java index c49aec71cae7..eac171aaefb6 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733708928631965265L; + public static final long serialVersionUID = -2733698427626094273L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 78ee365e078b..759fb47b6d07 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528102258075475238L; + public static final long serialVersionUID = 4528103984682796214L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java index f2e0634da779..5f9528c11149 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137354169430535354L; + public static final long serialVersionUID = 6137354188785978141L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java index 9a66f37f360f..f86893fc3a76 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751741842992723162L; + public static final long serialVersionUID = 751741862357365693L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java index 71edef0abee2..5fb6f3530fb5 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272735658876075647L; + public static final long serialVersionUID = -4272735804737767820L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java index 8dd401dd364b..dd011100f641 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612522471276933088L; + public static final long serialVersionUID = 6612519825063432008L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java index 0f136bcf39c0..f4188509ff0a 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036465106402669760L; + public static final long serialVersionUID = 3036462625345127080L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java index c509721ce190..4d4b6783aec8 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691109512616672680L; + public static final long serialVersionUID = 691100763000078001L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index ec0905dc0222..7b7fbfb5bca4 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424380271316300785L; + public static final long serialVersionUID = 3424372164683759848L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 76f6f96411ff..ffe74bbd42a4 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172598174883745568L; + public static final long serialVersionUID = -1172606077311292807L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index e30eda3c0ae5..04b0108473b3 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126108604202703719L; + public static final long serialVersionUID = -1126117392716387840L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 9c064ea48369..41cceaa6a37c 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097572784224705031L; + public static final long serialVersionUID = -2097581572733932832L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index 33d98ed72a3d..ec710b8f782e 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3029970997818342901L; + public static final long serialVersionUID = 3873342626284770183L; /** @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 1b92a77bcb5a..6b55c513aa27 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4681751746455139015L; + public static final long serialVersionUID = 9029323728451354187L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index eeb8235961eb..8f82df1e66b7 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6397002225241096809L; + public static final long serialVersionUID = -6397006146142733707L; /** @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 899dc99ceb8a..cd1823b09b87 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066888205042608922L; + public static final long serialVersionUID = -9066883231555377080L; /** @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 4e710fb7eb4d..54260ae0b9ed 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -857499364181620856L; + public static final long serialVersionUID = -4767630942521987676L; /** @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 b4c3811c5a62..65236335951a 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7410783625010818411L; + public static final long serialVersionUID = -3511876811311375098L; /** @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 15b8e8231ddc..f1a78f99b9c5 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2163572035030181113L; + public static final long serialVersionUID = 6869351868000684807L; /** @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 18e9a746ee8b..9d6a620a688b 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2486503967721964045L; + public static final long serialVersionUID = 7795244864548480755L; /** @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 8e31c94a52f2..6b47b49e8177 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1629648454762510810L; + public static final long serialVersionUID = 4039202671234173377L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index 3af54242218d..12d54d49d4f6 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655927445888208170L; + public static final long serialVersionUID = -7655926478603419757L; /** @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 cb6ddf92e923..9aa7ba70d02d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271124744583261048L; + public static final long serialVersionUID = -2271125711855454024L; /** @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 d2a0e4191f71..4dbb239ebc94 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4147521091493118397L; + public static final long serialVersionUID = 4147534775944419525L; /** @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 f08f96844737..41cca2f13ec3 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481713213707039021L; + public static final long serialVersionUID = 481705430043088207L; /** @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 7b3a4854f260..918e976a4fb8 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426887087067987241L; + public static final long serialVersionUID = -4426891007969345611L; /** @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 26ca58319ad1..e769d945c2eb 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850538466822789490L; + public static final long serialVersionUID = 850542888804654608L; /** @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 3de28927281b..d5aee8feb18e 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328898587349321933L; + public static final long serialVersionUID = -4328900116452001327L; /** @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 d5fd22387786..4a4d43f69dc0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081818697091810381L; + public static final long serialVersionUID = -5081814605560290991L; /** @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 282c53ab8ca2..00e72b514649 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643086384785731361L; + public static final long serialVersionUID = 643077317423359951L; /** @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 a0c56904d685..0e2441aab4f7 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438000886683858825L; + public static final long serialVersionUID = -2438005694986576074L; /** @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 2290e4845628..42e1c6367e48 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7153667144044746655L; + public static final long serialVersionUID = 6594407746340199136L; /** @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 a47638fa3a01..eed11db213bd 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8813705096433000024L; + public static final long serialVersionUID = -8813707617233996791L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java index 7b67703b57d0..f2ed17ef77c7 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410706920422700682L; + public static final long serialVersionUID = 4410693489307410923L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java index 446f21ff017b..dd3aed031667 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651532688669061230L; + public static final long serialVersionUID = 3651531721419825717L; /** @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 ad58106d23b3..3423361b7dfa 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804372268262338251L; + public static final long serialVersionUID = 8804374431540949136L; /** @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 9a43f7b96e72..47cd5c6c881e 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4989054022876479470L; + public static final long serialVersionUID = -4989067702254005313L; /** @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 e50568a7eb35..2285f0c68ed0 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353754572542863747L; + public static final long serialVersionUID = -5353764835926851034L; /** @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 d85af69cc0e7..ffd8de38e94a 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522141793659063381L; + public static final long serialVersionUID = -6522131364913008236L; /** @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 0c96c943099b..f3f79de949d7 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620283405840086632L; + public static final long serialVersionUID = 7620291024344943383L; /** @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 f7605e2a2e57..3003bcdb39d1 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -580246842972832918L; + public static final long serialVersionUID = 3437758605923156304L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index c9abd7e9bf0f..4c5433318f4c 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -530239829255568021L; + public static final long serialVersionUID = -8586805071947653748L; /** @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 423a96a69935..168e114a2cb2 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6359751357193939915L; + public static final long serialVersionUID = 2794386181486673809L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index 5d2d0fcf522e..19a83a9f013a 100644 --- a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - public static final long serialVersionUID = 4995619963721243147L; + public static final long serialVersionUID = 4995617378235640854L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index c6816c2c4e45..784d59a8a09e 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8017382949206961183L; + public static final long serialVersionUID = 4448038259910950291L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index aa4060b49b76..9aa203c42016 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyException.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734227822961611484L; + public static final long serialVersionUID = 5734225276300653210L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index 4dfedbc0226d..a7dd37c56247 100644 --- a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9151861585955928887L; + public static final long serialVersionUID = -5672829739044434961L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java b/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java index 655255fa4f32..3ef7a2ea9587 100644 --- a/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 1776555637662322531L; + public static final long serialVersionUID = 7882864961983644125L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java index 433a25b25e6c..c187420ef3d5 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final NestedClassStruct _nullMarshalValue = new NestedClassStruct(); /** @hidden */ - public static final long serialVersionUID = -2609323677515235838L; + public static final long serialVersionUID = -2609315190101518305L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java index 846a15c4a310..4ffdd7a0ccfa 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1404705351527843035L; + public static final long serialVersionUID = -1404702445754679519L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index cd6da4c17881..bb0daf2d84fa 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - public static final long serialVersionUID = -3400274911515516367L; + public static final long serialVersionUID = 6135624752197527346L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java index a0461ebb6c38..98ea7507c2bb 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final NestedClassStruct2 _nullMarshalValue = new NestedClassStruct2(); /** @hidden */ - public static final long serialVersionUID = 9184113848221705904L; + public static final long serialVersionUID = 9184127504313196973L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index 58113c1e19ea..1ea765d9221c 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8562132156086866793L; + public static final long serialVersionUID = -8562123663667316461L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 5162a4c1a257..39c5f0db9809 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - public static final long serialVersionUID = -5947312325150950570L; + public static final long serialVersionUID = -1695777856997853610L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index d2b634d35979..c8c408ac8734 100644 --- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1018339111654879516L; + public static final long serialVersionUID = 3126212521764265235L; } diff --git a/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java index 745e1ba1c053..19f5fdfae32e 100644 --- a/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5923073738297259230L; + public static final long serialVersionUID = -123941278233612876L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index 700ebf80a51a..cdc23d1a439a 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8683050255172026395L; + public static final long serialVersionUID = -533672229700608488L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index ef0d6f0c1a63..52f83a2dafb5 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8540743170113882287L; + public static final long serialVersionUID = 1498446640368371244L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index 7ef617d60077..dc1eea15fd37 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2306253638424403049L; + public static final long serialVersionUID = -1381145751768061684L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 2df480e97703..78f51cd4ee2f 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8034170117946078051L; + public static final long serialVersionUID = -4796639874336614749L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index bf0054fd5c91..125b6630d34d 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5042744976264621191L; + public static final long serialVersionUID = 8494520826385189508L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index 543ed8966c2f..e140f230dde9 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 305257431522490938L; + public static final long serialVersionUID = 1797100987709806667L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index 67a58a413728..056eb9c028f6 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5706855073824681971L; + public static final long serialVersionUID = -7647841819283770756L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index b58ccdc9a87a..5e9ed673e018 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -83,5 +83,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 511690829753037837L; + public static final long serialVersionUID = -8627638175384592728L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index b0f95b62c9dc..8a8bc71fafd7 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1449070147032152237L; + public static final long serialVersionUID = 5728504213315049555L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index c8b8c0dfc215..71240dff01d4 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2227247978033842775L; + public static final long serialVersionUID = -4613058969445790892L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index 24f6171cba44..4fe17cb107cd 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127392085685513460L; + public static final long serialVersionUID = 5127387522782404387L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index 16c0eb334783..b7fb94a14e25 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final InnerStruct2 _nullMarshalValue = new InnerStruct2(); /** @hidden */ - public static final long serialVersionUID = -7135053728456885662L; + public static final long serialVersionUID = -7135062390363025054L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index 6f746498c079..f2b3c6dd5323 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = 1932454296716758433L; + public static final long serialVersionUID = 6735229872069850995L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index 9a3b8f0c03b7..6ee060a43f61 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = -7007225982324706731L; + public static final long serialVersionUID = 7971159217972254613L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index dfa8b134690d..f147f3c1bc05 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - public static final long serialVersionUID = -2239721105001092772L; + public static final long serialVersionUID = -6933562970212222546L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index 05ba1cefb55c..1a705eecad4a 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct4 _nullMarshalValue = new Struct4(); /** @hidden */ - public static final long serialVersionUID = -6245969517010701477L; + public static final long serialVersionUID = 85979046123815657L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index 29de2b9c402f..911de7e34168 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = 1560738591999477415L; + public static final long serialVersionUID = 5307666581635586711L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 981d65440429..fe90b00e85b4 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java @@ -311,5 +311,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final StructProperty _nullMarshalValue = new StructProperty(); /** @hidden */ - public static final long serialVersionUID = 1517424825183556727L; + public static final long serialVersionUID = -6020961859759510796L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index b5dda932a3ab..c57c17495d05 100644 --- a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java +++ b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final TEstNv _nullMarshalValue = new TEstNv(); /** @hidden */ - public static final long serialVersionUID = 4030999357108618121L; + public static final long serialVersionUID = 8153181834279462055L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index 64216f7d1c3b..0c429c6d3b3a 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/A.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823741933262750955L; + public static final long serialVersionUID = 7823746789329666857L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index 2a94af66b333..b80aeddbf92e 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/B.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861419420409965781L; + public static final long serialVersionUID = -3861409109182487959L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index 87e0a3fc58b2..0b132d16aa30 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/C.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080695624465536235L; + public static final long serialVersionUID = 1080700480532452137L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index 2e710896c7b0..087898c18483 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/D.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780372847692112427L; + public static final long serialVersionUID = 4780383158919590249L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index f92ddbf79d7a..fc8e445a9bf6 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Color.java +++ b/slice2java/csharp/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - public static final long serialVersionUID = 1955659330774474102L; + public static final long serialVersionUID = -6297509329145119242L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index b6bc66951fd9..747b475e1c56 100644 --- a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - public static final long serialVersionUID = -2820063768705969066L; + public static final long serialVersionUID = -2820066619054117129L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index bd8759b07f7e..c347b1842508 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Draw.java +++ b/slice2java/csharp/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - public static final long serialVersionUID = 1687411205513281607L; + public static final long serialVersionUID = -1622698014876468346L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index fcdbbddcc7f0..82eda49c52dc 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1224570944129676860L; + public static final long serialVersionUID = -1224573794475455259L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index e9ff1d2cc882..3868e33b5d88 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8727119926959515850L; + public static final long serialVersionUID = -8727127901698397225L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index 55c7ce006d4d..ef137c821897 100644 --- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java +++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java @@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6594147872907284545L; + public static final long serialVersionUID = 2068388261789435455L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index f223a6f1592b..b492b5643ae9 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Pen.java +++ b/slice2java/csharp/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3116987564114559444L; + public static final long serialVersionUID = 1269460968414518260L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index 817643c72827..282b484a1ad0 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Point.java +++ b/slice2java/csharp/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - public static final long serialVersionUID = -5155176799208497200L; + public static final long serialVersionUID = -877580474555603600L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index 7625fa339c4e..43f47742a339 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointD.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - public static final long serialVersionUID = 4692765500565671776L; + public static final long serialVersionUID = -3979815979548851679L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index 8f1ec7ff7764..5062daa13eb4 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointF.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - public static final long serialVersionUID = 1532472032974670254L; + public static final long serialVersionUID = -6082294857154298129L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index 857379a74c6c..c3eb41a69eff 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Polyline.java +++ b/slice2java/csharp/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - public static final long serialVersionUID = -345029029159548320L; + public static final long serialVersionUID = -345037419750765311L; } diff --git a/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java index 8ecc7f7862b9..5119c02c227a 100644 --- a/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/csharp/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742726351603035181L; + public static final long serialVersionUID = -8742732510687376142L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index 8ab92ecb392c..3d4ee962ca36 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2568820224327700008L; + public static final long serialVersionUID = 2568828214704958468L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index bac671dfd535..411e04d486a5 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6709851996269353201L; + public static final long serialVersionUID = -6709849159049321203L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index 6d1e7525d255..a35a124a4ca1 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 244437727401695303L; + public static final long serialVersionUID = 244429770912169579L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index e80236eb1bc7..234ebf7a13f6 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1207064359766871920L; + public static final long serialVersionUID = -1207055956049701742L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index 7d1ae68c7176..dcbe2308e90d 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7599601855372512688L; + public static final long serialVersionUID = 7599609806871686044L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index 446f912690b8..5929175be187 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9211538789247730342L; + public static final long serialVersionUID = 9211532423684983969L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index f4256cbc7bb7..fb67bb26b486 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 770562023952151360L; + public static final long serialVersionUID = 770568384197299719L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index 431531e65802..feb8e10e36d7 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4823068403223913815L; + public static final long serialVersionUID = -4823063360124367698L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 4a3ee4147244..acdb52c094eb 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2279081042758681948L; + public static final long serialVersionUID = 2279074849935171611L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index 001f5be3ea04..8f4c40624f44 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3695545678519473586L; + public static final long serialVersionUID = -4567868169858576384L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index c4b9b67d7693..940acc8e25f4 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A1.java +++ b/slice2java/csharp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926745822248713924L; + public static final long serialVersionUID = -5926743252213826204L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index fba81ad63c13..901b80128415 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890919040053951435L; + public static final long serialVersionUID = -8890910294324682743L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index ff6cdbd128ee..cfdff65ff8b4 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B1.java +++ b/slice2java/csharp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7151060415268650884L; + public static final long serialVersionUID = 5097023496767914756L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index 68383021edcb..3a64ab9a5693 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Base.java +++ b/slice2java/csharp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6924419632392815978L; + public static final long serialVersionUID = 8563781551258932673L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index 0e090698505c..251d45a3d65c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/C.java +++ b/slice2java/csharp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4546463831912084477L; + public static final long serialVersionUID = -7334832355855880082L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index 9195ff25397e..0c65433ba642 100644 --- a/slice2java/csharp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050977560473065582L; + public static final long serialVersionUID = 3050968979954985580L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index 0fc95a8f3a0b..a7795b6d265d 100644 --- a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3350425259440976357L; + public static final long serialVersionUID = 6163999947411369883L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index fb12ae5ab8d1..68204ef67125 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D.java +++ b/slice2java/csharp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3526876550078491395L; + public static final long serialVersionUID = 5998974935924348301L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 20ba5eaea4f9..ff75541dbc02 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1321391590079805373L; + public static final long serialVersionUID = -2290254552709625789L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index 29c28df345a7..d43e88f80e69 100644 --- a/slice2java/csharp/test/Ice/objects/Test/E.java +++ b/slice2java/csharp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6649166667804191343L; + public static final long serialVersionUID = -4028672143054880148L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index 82f36c52f3f3..33e9fdf89be0 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1112851176302743730L; + public static final long serialVersionUID = 8079613041810098126L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index 93af17a99f30..2f7c847c6222 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 799733250811990226L; + public static final long serialVersionUID = 3197027092620433362L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index f2e78f66c11a..b84320c758a4 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225292703961100127L; + public static final long serialVersionUID = -6225283996879265885L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index fd533327ef3a..b0d2eb4682c2 100644 --- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -4005169381914685804L; + public static final long serialVersionUID = 7592584440223247124L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index 5e132fa3ca06..2e144cacdfd4 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F.java +++ b/slice2java/csharp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5281440713030905937L; + public static final long serialVersionUID = 6151770173668287185L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index 7e80e0798e07..181437a3da15 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F1.java +++ b/slice2java/csharp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192374255760490074L; + public static final long serialVersionUID = 6192375908831639282L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index f362e0028ba8..897ddb0afeb0 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F3.java +++ b/slice2java/csharp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6600481587188552635L; + public static final long serialVersionUID = 6334009223985465463L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index b78b10e1e983..0c242141ebbc 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/IBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4060270129834864890L; + public static final long serialVersionUID = 4060266924415368226L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index 8d145a0fe360..1c1365e336bb 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/IDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7299534371076261090L; + public static final long serialVersionUID = 7299531886429985338L; /** @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 0ec61a42047a..bf28a1b4411a 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425260814883549985L; + public static final long serialVersionUID = -1425258206062727517L; /** @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 d0ade285ba3a..08d00207f53e 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337229656887008379L; + public static final long serialVersionUID = -2337226451462911779L; } 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 0f2b7daaf536..2d40c1995841 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298678723448031159L; + public static final long serialVersionUID = -1298687675969874271L; /** @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 4bfa832ff66d..7e5633199335 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842237967693028257L; + public static final long serialVersionUID = 1842230107961598201L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index 1b31b05b798b..e6d2e42d63e4 100644 --- a/slice2java/csharp/test/Ice/objects/Test/K.java +++ b/slice2java/csharp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645162129365705666L; + public static final long serialVersionUID = 4645159042982908889L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index d669992d3643..0123699c0403 100644 --- a/slice2java/csharp/test/Ice/objects/Test/L.java +++ b/slice2java/csharp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629738657983533111L; + public static final long serialVersionUID = 6629747610434237167L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index 62b7e5d004a4..41cecfac957c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/M.java +++ b/slice2java/csharp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088097462814955805L; + public static final long serialVersionUID = -8088105607047318572L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index f7769ba5eae3..caaf42d3c320 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/csharp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617877212265257643L; + public static final long serialVersionUID = 3617886038392697417L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index cb80264c3fac..ac02430b700c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S.java +++ b/slice2java/csharp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481771477059148804L; + public static final long serialVersionUID = 481774602402959580L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index bfbb1084eaeb..6fa14353ed7e 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S1.java +++ b/slice2java/csharp/test/Ice/objects/Test/S1.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 7211340224943003337L; + public static final long serialVersionUID = 7211342748596179762L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index 5189e2cc34fb..e2d662b1aa74 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SC1.java +++ b/slice2java/csharp/test/Ice/objects/Test/SC1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SC1 _nullMarshalValue = new SC1(); /** @hidden */ - public static final long serialVersionUID = 186202519202110894L; + public static final long serialVersionUID = 186210748598091382L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index 4c5176b8aaf3..69144ff9ee2f 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227753123487558583L; + public static final long serialVersionUID = 6227745018381367093L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index 81e6fd1b50bd..a6575334b08c 100644 --- a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -3640310081537409534L; + public static final long serialVersionUID = 7805494968719662978L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index a2978e6761db..c9164f60de0b 100644 --- a/slice2java/csharp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/csharp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 1825044328622856355L; + public static final long serialVersionUID = -145556987229148000L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index 3a271eb7a8a8..8a7497e8be1e 100644 --- a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723846392566700195L; + public static final long serialVersionUID = 2723848559808787440L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index d003cfbe178d..049a23b14500 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3425142489794180278L; + public static final long serialVersionUID = 1195294952723299321L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index f565271d253d..efa8eefebf5f 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 8456424711043415101L; + public static final long serialVersionUID = 5317866050598108253L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index fd7efb1883e8..223aadb44062 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = -7948870513440160029L; + public static final long serialVersionUID = -6944218474366591024L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index 4e6bd372d5ae..b72546bed2b1 100644 --- a/slice2java/csharp/test/Ice/operations/Test/Structure.java +++ b/slice2java/csharp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = -7756846125930756418L; + public static final long serialVersionUID = -1951178560582604979L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index f488c62ee734..433e2ca1ffff 100644 --- a/slice2java/csharp/test/Ice/optional/Test/A.java +++ b/slice2java/csharp/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4709318058071646320L; + public static final long serialVersionUID = -5386118097780917232L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index adecc0945de5..67fa72aa22cf 100644 --- a/slice2java/csharp/test/Ice/optional/Test/B.java +++ b/slice2java/csharp/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -492743366596894749L; + public static final long serialVersionUID = 2522362415101894627L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index 13f0c7e8933d..281fd0874fd9 100644 --- a/slice2java/csharp/test/Ice/optional/Test/C.java +++ b/slice2java/csharp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3728589018540490627L; + public static final long serialVersionUID = 1568284784463750525L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java index ddebb74a7f55..ed0213573f88 100644 --- a/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4360002784407684049L; + public static final long serialVersionUID = 4359994703766919602L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index 72b17f8b702b..7ed26f0fcd5f 100644 --- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8421497391034236654L; + public static final long serialVersionUID = -5072801464926133516L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index b3d05047c377..174088a69366 100644 --- a/slice2java/csharp/test/Ice/optional/Test/E.java +++ b/slice2java/csharp/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399097046389678404L; + public static final long serialVersionUID = 4399099671873090406L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index 954c58d3e9ff..52e943f333a1 100644 --- a/slice2java/csharp/test/Ice/optional/Test/F.java +++ b/slice2java/csharp/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111940783173350903L; + public static final long serialVersionUID = 2111948902707757909L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index 13da1e339aeb..0c0b89029ba8 100644 --- a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569613770808215520L; + public static final long serialVersionUID = 1569605651270459779L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index e02a8a6d8728..ece626d600ad 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G.java +++ b/slice2java/csharp/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4511238050081242349L; + public static final long serialVersionUID = 1928516863216339987L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index da59b60389fd..5c537b303d50 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G1.java +++ b/slice2java/csharp/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356162056742591068L; + public static final long serialVersionUID = -356164847618491120L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index 19320cc9c6b7..f7027063ed2c 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G2.java +++ b/slice2java/csharp/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44041530992573998L; + public static final long serialVersionUID = 44033450426997061L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index 26af70e2f195..fd7a9c3c1810 100644 --- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java @@ -1783,7 +1783,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4217727931101014028L; + public static final long serialVersionUID = 4984378297878575245L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index d8910e9e042b..1f32f7c901b1 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219608802685704562L; + public static final long serialVersionUID = -7219600556737040211L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index 5219691e8c05..afda2cd033e4 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8655856085750089528L; + public static final long serialVersionUID = 2246142080751036972L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index f11b0184f977..9c23624f4522 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5048681924013423810L; + public static final long serialVersionUID = -6310176993655803356L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/Recursive.java b/slice2java/csharp/test/Ice/optional/Test/Recursive.java index fb0805774459..6e6492eeed4c 100644 --- a/slice2java/csharp/test/Ice/optional/Test/Recursive.java +++ b/slice2java/csharp/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055420877348703847L; + public static final long serialVersionUID = 9055423707046133892L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index 37b53a6b57dc..bfbb50c22f90 100644 --- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3670285717197667349L; + public static final long serialVersionUID = 4477042941288752115L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index b17a02f24d1d..707f54a7fddc 100644 --- a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700992031298293486L; + public static final long serialVersionUID = 6700983746468302072L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index 02f56469fa49..21157cb94348 100644 --- a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912285419886901371L; + public static final long serialVersionUID = -1912288210756040911L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index 85592c00e298..53e3864e511f 100644 --- a/slice2java/csharp/test/Ice/optional/Test/WD.java +++ b/slice2java/csharp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6914523854382108291L; + public static final long serialVersionUID = 238235760526555252L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index bb20fe722fde..6ed40cde1dd8 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190247204081032802L; + public static final long serialVersionUID = -5190251542057684162L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index 7fded33649c5..11853a66fe0c 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C1.java +++ b/slice2java/csharp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893233111507883940L; + public static final long serialVersionUID = 8893231668997891012L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index 2cb1625f485f..7a5ecaae40c5 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C2.java +++ b/slice2java/csharp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8153807933344761053L; + public static final long serialVersionUID = -8337815958453098624L; /** @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 f6f8fda78c60..0a1af79c0577 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615622936628251820L; + public static final long serialVersionUID = 4615629834342698684L; /** @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 5e05c9588bbf..004be06740d4 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672588780156539953L; + public static final long serialVersionUID = 672584447404252898L; /** @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 36ac7c4bd223..05b644115a23 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654439192431822770L; + public static final long serialVersionUID = 8654440965708039393L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index a6dc5785fa4b..9164569a5367 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694621504746646142L; + public static final long serialVersionUID = 3694611716777480493L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index 41df330f9bd5..e9cc7d634187 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159697382851911488L; + public static final long serialVersionUID = 2159709730515261075L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index 5049aae804cc..f11635c7199a 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S1.java +++ b/slice2java/csharp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241674833657089053L; + public static final long serialVersionUID = 1241675950707814653L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index b956542d7819..af9c8ba42398 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S2.java +++ b/slice2java/csharp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 7323596003541643556L; + public static final long serialVersionUID = 3189736795779749881L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index 3dee1f10e3db..fc57f5837c12 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2039944434311415307L; + public static final long serialVersionUID = 2039936999180750090L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index 5876f926acb9..da9f9846db5f 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3369453503139596141L; + public static final long serialVersionUID = -3369456973390064942L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index df8381ee104f..0f6e028ca3ff 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/S.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = -691303712627238852L; + public static final long serialVersionUID = -691296269973513347L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 21a38fad29b7..eaef92a0c5b4 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final SD _nullMarshalValue = new SD(); /** @hidden */ - public static final long serialVersionUID = 9219740060060804760L; + public static final long serialVersionUID = 9219736752687093721L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index 870b9b29ed08..2e352348cffe 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477020452042286237L; + public static final long serialVersionUID = -477017037403317616L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java index e27be6b2d286..89ef9e8fc298 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435638558336867673L; + public static final long serialVersionUID = -8435640598858878636L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index c1e223a76cf6..95a7bba4f880 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485217933854559877L; + public static final long serialVersionUID = 3485210432854465462L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 0bd624b40ca3..e3d0559a966d 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717374564803709556L; + public static final long serialVersionUID = 1717371315624717511L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index d7162c16e65f..d9f467873211 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384915046469174291L; + public static final long serialVersionUID = -7384916926848591074L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java index f8f2ba6927c6..3a6359b44caa 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733712006115367448L; + public static final long serialVersionUID = -2733703061405668005L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 9f6b25aba83d..cc51b8635a36 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528099268232425441L; + public static final long serialVersionUID = 4528108298174410770L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java index 8db2249f042e..d3b9f061ad6d 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137361126542468723L; + public static final long serialVersionUID = 6137362066801167474L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java index 118bdaedd1f8..7f6428b51698 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751743344953429651L; + public static final long serialVersionUID = 751749910689924626L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java index 3d7a6e6926f6..28dfa43d38d1 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272731656551882470L; + public static final long serialVersionUID = -4272727162094334727L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java index 1f22c0e57bdb..ef9f3ae73791 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612524070041332052L; + public static final long serialVersionUID = 6612523509759751028L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java index 70a927f1ee9a..771e66ed9553 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036461580631223860L; + public static final long serialVersionUID = 3036461025359116884L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java index baf0066b5b28..07db94446975 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691104863337128778L; + public static final long serialVersionUID = 691104925327183884L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 614eecd78998..3bb5488fe0a6 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424368064194776275L; + public static final long serialVersionUID = 3424367671598386453L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index c66426f0db05..55fa998bbc05 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172601997637589374L; + public static final long serialVersionUID = -1172602431557434300L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index fb126d993495..ad670f0cc533 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126115851921764613L; + public static final long serialVersionUID = -1126115753612984515L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index ca5b3a47ea7b..50a225747c5b 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097585652559429925L; + public static final long serialVersionUID = -2097585383942619363L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index 37b6b0ea2558..b3348a25849e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7011821692034864848L; + public static final long serialVersionUID = 4138029201066411015L; /** @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 0bf3e2e8a5ef..e4ff09db157d 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4690923102327848732L; + public static final long serialVersionUID = -2496171717857506869L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 21b41e2a6d44..dd54170cb733 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6396993394441621362L; + public static final long serialVersionUID = -6397005464510992412L; /** @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 68f293a573f9..64d87fe8cc72 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066881909087546450L; + public static final long serialVersionUID = -9066880744193095602L; /** @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 4edafcadf8dc..2eec3b9d9ffd 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3796741195738669523L; + public static final long serialVersionUID = -761520268135534236L; /** @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 55f88f770123..e9e49e0ba095 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3974406126908938816L; + public static final long serialVersionUID = -6473086602981253690L; /** @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 177bea479a71..5097dc5db4f6 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1174435406250378471L; + public static final long serialVersionUID = 2874999242454828737L; /** @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 6997f165a197..5a8868399188 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5988349543155159949L; + public static final long serialVersionUID = 7346199871250531635L; /** @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 4f92f88aeea6..c0f240e0f178 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1296918731816562805L; + public static final long serialVersionUID = -1992611183675583231L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index e1e23ac7beca..e2a7fe2e4e4b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655917056105566409L; + public static final long serialVersionUID = -7655923991240724459L; /** @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 b6edffac2f0c..8ffe18bd6231 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271135134412474587L; + public static final long serialVersionUID = -2271128199227218498L; /** @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 91e0c6cdfe5f..afbed5046ac2 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4147528055090540651L; + public static final long serialVersionUID = 4147524725588841204L; /** @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 7642e7eee023..f76f7e268855 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481706917761903482L; + public static final long serialVersionUID = 481713853011269321L; /** @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 960c46a86bde..9b0ffcf59b52 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426878421272816050L; + public static final long serialVersionUID = -4426885201489107548L; /** @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 f987d64f6db0..b7f1478990bf 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850536103400771450L; + public static final long serialVersionUID = 850536586504759132L; /** @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 594ea100a4a0..e254c61305fb 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328906605016050214L; + public static final long serialVersionUID = -4328901829103533626L; /** @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 df72bac77d6e..0b8bbcf92d2a 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081810676896894230L; + public static final long serialVersionUID = -5081815452764102584L; /** @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 40fdc9c00d58..bfbc0edd75a5 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643075994955529193L; + public static final long serialVersionUID = 643085740373280713L; /** @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 42a7ebe2feb0..79eb01f63633 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438007182667299100L; + public static final long serialVersionUID = -2438013797656330448L; /** @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 1197c3708aa3..7e17410b43d3 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1854838687812468210L; + public static final long serialVersionUID = -6315049229005529149L; /** @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 8f9a0599eea6..4afb3911ce17 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8813709004298695032L; + public static final long serialVersionUID = -8813708245020819095L; /** @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 90d5c4fb9aec..f0ed983100dc 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410692102273213465L; + public static final long serialVersionUID = 4410703451686651413L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index 841dcfbc9174..d73e9633cee9 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651522298885259942L; + public static final long serialVersionUID = 3651529234066748467L; /** @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 8b8e37141f11..ff1c7570ad56 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804373109084004099L; + public static final long serialVersionUID = 8804382534206242966L; /** @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 126ff961a530..39f1d26adf61 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4989060986470170684L; + public static final long serialVersionUID = -4989057657059609377L; /** @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 d3dc8754fa55..6d5d32dbdd8f 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353755413364406859L; + public static final long serialVersionUID = -5353762028270742752L; /** @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 524c81e5aa61..6a711a523539 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522130042552934045L; + public static final long serialVersionUID = -6522139787876441326L; /** @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 404cb2ab7e8a..d58a31e0d8e9 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620289701785654048L; + public static final long serialVersionUID = 7620288216693718161L; /** @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 f056cf905dde..a9051aeba13e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -7020947108728397608L; + public static final long serialVersionUID = 1639968759377708624L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index 1d2b4d7de4d1..99049c0191af 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2818299620073936419L; + public static final long serialVersionUID = -3908806899656709358L; /** @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 7300ca491e80..cffc60a115cc 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8938189521861644680L; + public static final long serialVersionUID = -8180350072523466286L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index 31b4595153bd..7846ceff6e4f 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4283407809920049168L; + public static final long serialVersionUID = -1123349326568778053L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index 498ce257d1ce..76e88d78016d 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyException.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734225312552267937L; + public static final long serialVersionUID = 5734227341284318283L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index bc8fbbae295f..c0c0788cf522 100644 --- a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3917661313984060179L; + public static final long serialVersionUID = -2051089682786023091L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java b/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java index 13d11ed9d32f..cd45fcac2e14 100644 --- a/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/csharp/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6278455842584949182L; + public static final long serialVersionUID = 3431041464381382334L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index 268695448d37..ac7098fdf34b 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Cls.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1918525831769146530L; + public static final long serialVersionUID = 1780124004728608255L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 2f847fd03cb0..9f9121e611bf 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java @@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7011695496434325594L; + public static final long serialVersionUID = -5082866907718356388L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index 9692e1f04ee7..f8204fb958ef 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/St.java +++ b/slice2java/csharp/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = 3985343520695253351L; + public static final long serialVersionUID = 5013955853937142802L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index f72be466825c..abedeab6ebdf 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java @@ -147,5 +147,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3196779606924829297L; + public static final long serialVersionUID = -2439296421345924072L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index ee6b6f3e664f..3d2e25b4153f 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/_break.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - public static final long serialVersionUID = 3009638064395518686L; + public static final long serialVersionUID = 3009641131705213367L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index e3a649b3b1b5..029dd9df032b 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6246998084382347015L; + public static final long serialVersionUID = -5870267460052250329L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index aead52816729..fd90257133f8 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8293824316927008822L; + public static final long serialVersionUID = -8293832159947916125L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index 827d4448e046..58f45cc4f6eb 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4934538450822543357L; + public static final long serialVersionUID = 1915142670232400707L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index 10cf11316100..997d4c7b44f1 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java @@ -315,7 +315,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -689908130685580865L; + public static final long serialVersionUID = 3166958591759274070L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index a68bcba839bb..3853abc21651 100644 --- a/slice2java/csharp/test/Slice/macros/Test/Default.java +++ b/slice2java/csharp/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5215126609114830750L; + public static final long serialVersionUID = 4396176157594752478L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index 3d081ae43c04..de4603498572 100644 --- a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3051973718816964481L; + public static final long serialVersionUID = -3831159020685189441L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index 523155afbfa5..9e1e9171fdcb 100644 --- a/slice2java/csharp/test/Slice/structure/Test/C.java +++ b/slice2java/csharp/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3172281573330522945L; + public static final long serialVersionUID = -3172278263229154088L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index 5081c0cced28..36ce8cf16570 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S1.java +++ b/slice2java/csharp/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = -5542858093949832539L; + public static final long serialVersionUID = -5542859913701473650L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index 173e3bc5430d..d5e0c88bcda4 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S2.java +++ b/slice2java/csharp/test/Slice/structure/Test/S2.java @@ -286,5 +286,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 6941097803154416387L; + public static final long serialVersionUID = 6677597385698178644L; } 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 2aa7f283d659..363d55b85221 100644 --- a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8025901712504761478L; + public static final long serialVersionUID = 4427539495594915454L; } 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 2960b009d615..7adf170bdc7c 100644 --- a/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java +++ b/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4974440550831021479L; + public static final long serialVersionUID = 1469660977892803239L; } 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 5a0f68ed8377..eebef33ffd7e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6434297492771822169L; + public static final long serialVersionUID = 6434295670602406967L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java index 846e92a8d194..9be6913f735c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = -2014568859045718715L; + public static final long serialVersionUID = -2014571442250087663L; } 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 51db658728c6..d2f201b724ea 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 865243614204739250L; + public static final long serialVersionUID = 2433821031235973996L; /** @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 900ced17f249..e8493c4295ad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7793351791307788870L; + public static final long serialVersionUID = 5641775292352798232L; } 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 0662863565b3..88e9c2061312 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -840187178342683619L; + public static final long serialVersionUID = -6357946779130471230L; /** @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 8e2a1be1da8a..be194d5d36f4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8935284020947652238L; + public static final long serialVersionUID = 8187192420716638521L; /** @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 2e192c61a35f..c247f09fb9bb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 873150136098128530L; + public static final long serialVersionUID = -7960403075088583123L; /** @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 eaddfc809534..7f72d93a99e4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2257664028741016795L; + public static final long serialVersionUID = 1870745978228424602L; } 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 962c35dd6d08..49e5e3949f4f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2964065528265301383L; + public static final long serialVersionUID = -2497268794790199514L; } 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 89e2fb42e27b..9c1ed64258ff 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8103710581939712574L; + public static final long serialVersionUID = -1904061243894740407L; } 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 75e7fd3de549..f6d16fa30038 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127388858383302317L; + public static final long serialVersionUID = 5127391490242866448L; } 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 6de4621a1d53..51b0af139ff9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = 7084886804565565760L; + public static final long serialVersionUID = 4626596145482898977L; } 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 4b27ef919117..bc308d116588 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = 3551858116168876723L; + public static final long serialVersionUID = -185659045387637555L; } 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 898a6e32d381..f34b1ebec834 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = 6160696347356631656L; + public static final long serialVersionUID = 7996441460051310409L; } 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 948e33b050cd..bec138fb580b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823746405525399307L; + public static final long serialVersionUID = 7823746873099759311L; } 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 52fc6a74aa0a..3d4848db9efd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861409327678716085L; + public static final long serialVersionUID = -3861409025260458481L; } 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 aa882f230263..126f2bf5f543 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080700096728184587L; + public static final long serialVersionUID = 1080700564302544591L; } 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 c504dd364115..fe07c3cba27b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780382940423362123L; + public static final long serialVersionUID = 4780383242841619727L; } 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 89392e5afd39..74331a6e9d5a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823746587763496781L; + public static final long serialVersionUID = 7823737803236359101L; } 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 54eed32e3153..ad308bec9214 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861409310900316787L; + public static final long serialVersionUID = -3861412640266753155L; } 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 8732f2ca18b4..f7e09bf3523c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080700278966282061L; + public static final long serialVersionUID = 1080691494439144381L; } 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 8b939dabfc5d..b09ca6960496 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780382957201761421L; + public static final long serialVersionUID = 4780379627835325053L; } 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 15613ea0c0ee..a4985b79e71e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - public static final long serialVersionUID = 1801157202140901366L; + public static final long serialVersionUID = 7048019434824491638L; } 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 ac54020f1eaa..fb4a4db7236b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - public static final long serialVersionUID = -2820073352861544216L; + public static final long serialVersionUID = -2820064617315384030L; } 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 9d586d77b700..7249f3077792 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - public static final long serialVersionUID = -2942460917547821479L; + public static final long serialVersionUID = -8593622045040612865L; } 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 8045e1aee9c3..230dbe3589a7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6903058657937757847L; + public static final long serialVersionUID = 7094284945952938122L; /** @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 534d86f99e14..006f2db19b1f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - public static final long serialVersionUID = 4839848675103257136L; + public static final long serialVersionUID = 9051125174199873072L; } 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 cb16557fde61..4ed5334f6d0f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - public static final long serialVersionUID = 2756580745858421725L; + public static final long serialVersionUID = -1742693303357972457L; } 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 7a33c2fbec79..d6d4b3f760ee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - public static final long serialVersionUID = 1321417429828418893L; + public static final long serialVersionUID = -4823075032661718241L; } 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 d8a65b1848f4..25489306ef27 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - public static final long serialVersionUID = -345030355360125855L; + public static final long serialVersionUID = -345027149888214267L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java index 95be717e5670..41a0f61af387 100644 --- a/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/java/test/src/main/java/test/Ice/interceptor/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742730369416626974L; + public static final long serialVersionUID = -8742727494465730043L; } 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 7da87d2bea6b..7f1b1a752d9d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2319585885275123032L; + public static final long serialVersionUID = 8920872706531812166L; /** @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 4cdfd7ea582d..5a9fb9cd0552 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926739244859336907L; + public static final long serialVersionUID = -5926741950424477657L; /** @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 5239e75f1739..fdf8773cafe1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890911576624303094L; + public static final long serialVersionUID = -8890919936436329827L; /** @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 c103c505ccd8..2b49fb481824 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -115987768016187388L; + public static final long serialVersionUID = 3818792269232128708L; /** @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 de7ffbd922fc..416037a03fc8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2597746530598649861L; + public static final long serialVersionUID = 5564602318607454498L; /** @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 97a63568b2c9..9cb8e15a4fbb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4156187114991472525L; + public static final long serialVersionUID = -1124269439889951205L; /** @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 f93a2bea356b..a68a29289dd7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050964807142779568L; + public static final long serialVersionUID = 3050973332355585693L; /** @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 6edd017a7741..d6eba5ce880d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5482817802589509915L; + public static final long serialVersionUID = -1527444832845849765L; /** @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 06402456adec..fe7e87d2ebc2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6592345029271348810L; + public static final long serialVersionUID = 8023352260301913951L; /** @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 11bec4488d2f..d4489223c786 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5177065937473935939L; + public static final long serialVersionUID = -2878434010659060221L; /** @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 2c609dfc214e..5bd26c28601f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6186077580335693177L; + public static final long serialVersionUID = 1452046858710276333L; /** @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 139574333fa0..a7a5e2c1ae6c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2574532723997027378L; + public static final long serialVersionUID = 6711819814323368334L; } 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 bb14bcff6a0a..d5c27953cca8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8370124176836286126L; + public static final long serialVersionUID = 7407449098875874834L; } 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 2683cc246aba..cd236962dab7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225279989526724993L; + public static final long serialVersionUID = -6225288475843448174L; } 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 5c623a3a2a83..628650167d5c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1894106351186691436L; + public static final long serialVersionUID = 8914596578556597972L; } 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 17051c1a1dd6..a50f0b68ed88 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7258173792282549871L; + public static final long serialVersionUID = -8220718396375978415L; /** @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 f1c37fd9f9b7..5d3a8d893c99 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192374111252671137L; + public static final long serialVersionUID = 6192373402329253132L; /** @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 a9d3e8918609..975f23b369e3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -945989670176876271L; + public static final long serialVersionUID = 4318360892895502084L; /** @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 0df46aee4b56..e25f27b497c0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425254198656892768L; + public static final long serialVersionUID = -1425256943161438025L; /** @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 477a1754aa0d..6fb00a6a53bb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337225003670356468L; + public static final long serialVersionUID = -2337227748114123490L; } 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 cac4ebdc9273..3c4565968ceb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298688958253080375L; + public static final long serialVersionUID = -1298680637271417209L; /** @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 baef915b9f0d..311111e71da7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842225935143228968L; + public static final long serialVersionUID = 1842234421314407738L; } 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 978d82715ca0..b5abd9094cff 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645160490562005540L; + public static final long serialVersionUID = 4645163361418474425L; /** @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 c770f6b8d4eb..9734119438b6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629743437611997758L; + public static final long serialVersionUID = 6629735116766979372L; /** @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 48be0faf1211..3afca76a6cf6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088101599471179531L; + public static final long serialVersionUID = -8088093239708788838L; /** @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 3aa054570c15..821ebe862154 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617887485981751439L; + public static final long serialVersionUID = 3617879126223840360L; /** @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 be03fc05e559..e6b2b38a7201 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481773320041493773L; + public static final long serialVersionUID = 481770575602326687L; } 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 3fdef5d29ad2..cb6c9f21ba07 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227749025724962793L; + public static final long serialVersionUID = 6227757346733422980L; } 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 73f8172af702..56abf9cd3584 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -6547738001860084478L; + public static final long serialVersionUID = 6327823221010100802L; } 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 2616c03d8dc3..e5c3f3ac6e21 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 8722739820089757493L; + public static final long serialVersionUID = -1164321326762015967L; } 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 e1b0650129ee..3ef2083872a1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723850257999974051L; + public static final long serialVersionUID = 2723850339298272168L; } 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 801426920704..0ddc61b7627a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 267799168275999949L; + public static final long serialVersionUID = 2114739753969625630L; /** @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 6fff3f9bbb52..a418cb188542 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 6163271649895027677L; + public static final long serialVersionUID = -1419061794894663619L; } 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 ce5ec90f37c4..003d145ea2e5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = 4361680950495348932L; + public static final long serialVersionUID = 314730870447290007L; } 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 7582c71ba7a8..3d042754d80f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = -551812646332574400L; + public static final long serialVersionUID = 5885060573316812311L; } 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 45c168f8285a..28e98de8a975 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723844322420735363L; + public static final long serialVersionUID = 2723845028778312181L; } 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 29fd16b16bf0..327e45ac17e4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2675542448415379587L; + public static final long serialVersionUID = 7719127904962429275L; /** @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 a0d5792f3e10..6b66688319dc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 8725576136748747901L; + public static final long serialVersionUID = 8078244557155948573L; } 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 6af33dfcf644..b6e31db7fd92 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = -2425200279952273228L; + public static final long serialVersionUID = 8910129749148865234L; } 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 2c235ee98f57..2242478d4c29 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = 5279891260184132339L; + public static final long serialVersionUID = 2710520520845430742L; } 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 8ac628032de7..95b6ec7ea9d7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6307123888223042448L; + public static final long serialVersionUID = 5846584947839625616L; /** @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 63bf297ebc90..1577cac30f82 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4816697120675420829L; + public static final long serialVersionUID = -5049904320918771869L; /** @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 1636313dbac7..ce6f334ad61e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4742659299878376253L; + public static final long serialVersionUID = -8536513272158109059L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java index 8ae70ac91206..e83e68753889 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359994601664269724L; + public static final long serialVersionUID = 4359995407688892825L; } 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 a674551209e7..da3d590a9d77 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7127669778994106902L; + public static final long serialVersionUID = 6843049310598024446L; } 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 1e23ca4094e1..229ec3e947a8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399099773986501660L; + public static final long serialVersionUID = 4399093513014998929L; /** @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 e3d59ccbcb90..7fdcca9ddd5b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111948965926242479L; + public static final long serialVersionUID = 2111949771708735650L; /** @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 43c3df133e94..c4601bdbd4a9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569605588065914157L; + public static final long serialVersionUID = 1569604782035998632L; } 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 d41526e969fe..822356547065 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6795879233614859347L; + public static final long serialVersionUID = -7900972118759858157L; /** @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 03d1881fa6f9..57bfcf827195 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356164784476568937L; + public static final long serialVersionUID = -356161253385280653L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java index 148d9362b4aa..414e6aec1d98 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44033348401433505L; + public static final long serialVersionUID = 44034154346628795L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java index 6e5a297ee07d..cc995f69050a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java @@ -1837,7 +1837,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4038911174409895940L; + public static final long serialVersionUID = 8631942078034362920L; /** @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 f2a2a6813516..71c941af25f5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219600619942290237L; + public static final long serialVersionUID = -7219601260507215418L; /** @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 09155985466b..754ac1a7c323 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3028600430773044059L; + public static final long serialVersionUID = 3238287417417728853L; } 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 e117a4242de4..e839571a9148 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java @@ -205,7 +205,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -662778410800272293L; + public static final long serialVersionUID = 6884317156425712637L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java index bec667c50099..511f0292fc8e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055423604928606786L; + public static final long serialVersionUID = 9055421515579192967L; /** @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 43c0e969932e..675399a28fda 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8119942545404342061L; + public static final long serialVersionUID = 116237924239241465L; } 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 3ff0194fd3d0..bb95e8d0d321 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700983848471814073L; + public static final long serialVersionUID = 6700991227855962843L; } 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 eb018dbc80bc..51d5fe93ebe1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912288147620946762L; + public static final long serialVersionUID = -1912287506984403502L; } 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 1b461dd2eef1..be893d59ce04 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9094117378250737955L; + public static final long serialVersionUID = 4470594606548848668L; /** @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 7e5ca160991d..7ff1e69aa680 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3678567485353210992L; + public static final long serialVersionUID = -1062456392460111216L; /** @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 449fed98f315..be2b1aab344e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2687193685825687261L; + public static final long serialVersionUID = -6161833625043607069L; /** @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 62a94e98a8cc..2e97442ef9c5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1988280497121593469L; + public static final long serialVersionUID = -2057788064484490307L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java index c180bb42a1a9..2e743e1bd90f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359993498892349413L; + public static final long serialVersionUID = 4359994619899884120L; } 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 bc5d0ff31294..25dfae14e8ec 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8838743194616519504L; + public static final long serialVersionUID = -8880173304524216560L; } 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 a0fd62e8ff2c..2bc8db483667 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399096098607763637L; + public static final long serialVersionUID = 4399099916130227080L; /** @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 822be5059d05..b3ffd0ffb55a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111948183280613894L; + public static final long serialVersionUID = 2111948984085556027L; /** @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 01e0e75dab38..294df01e0292 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569601592249519828L; + public static final long serialVersionUID = 1569605564829620713L; } 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 56c64d1410d7..f2af934437c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1834779172501859373L; + public static final long serialVersionUID = -2700225575291545133L; /** @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 f58905e7289b..f7d6d7a9838f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356163154492359774L; + public static final long serialVersionUID = -356164763849820321L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java index 61f597ef4eed..3c0644448172 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44032245648763576L; + public static final long serialVersionUID = 44033366599366277L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java index 60efa058fa9a..be72be37c0dc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java @@ -1837,7 +1837,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5775461373315237397L; + public static final long serialVersionUID = -5615242538410151317L; /** @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 3915bb878c53..58aec1ab46f2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219599351710950662L; + public static final long serialVersionUID = -7219600803485804665L; /** @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 4a5f2e7fed6d..f96936e84013 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6721251298297620634L; + public static final long serialVersionUID = 6495768823895656410L; } 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 4452d37eefb9..e4bffadbf79f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java @@ -205,7 +205,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4696542724619541766L; + public static final long serialVersionUID = -992275813003354437L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java index 722afcf9337f..1dd50677cfc7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055419929409875645L; + public static final long serialVersionUID = 9055423620585044224L; /** @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 1effab64ac53..b75cdb018f05 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1213334727305986857L; + public static final long serialVersionUID = -3070133655530739689L; } 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 77066b8040a4..6f7e5eec8c7f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700987358624972201L; + public static final long serialVersionUID = 6700983998207769428L; } 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 3173dce67403..7a798cd0accf 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912283955511347837L; + public static final long serialVersionUID = -1912288124406803842L; } 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 eb60ec31beca..7fe13e02e880 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1805360985451803407L; + public static final long serialVersionUID = 7791371209093942865L; /** @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 8096269f2a88..f604d291c324 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1894606848751250988L; + public static final long serialVersionUID = 1894604884498567980L; /** @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 33f78a08ac37..ff48c4827a78 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2892576796863062309L; + public static final long serialVersionUID = 2892578761121320997L; /** @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 a9a5a75ed68d..bce8d356252a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5787330253619827939L; + public static final long serialVersionUID = 5787336389458985827L; } 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 59830a25ca9c..0ec923ab0910 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4908756634848887807L; + public static final long serialVersionUID = 4908757315526229503L; } 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 2b2cbfb487d6..f7877d68f75f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4322851083431512980L; + public static final long serialVersionUID = 4322855857913757204L; } 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 82d05c0ad3a3..4b560b1cc463 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5832346587719733401L; + public static final long serialVersionUID = 5832345860709378511L; /** @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 be24ab66877a..dd8f52662093 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2769381964268132882L; + public static final long serialVersionUID = 2769377065658892868L; /** @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 e416a31d39d3..d8ce6a99dde0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5344590847510764118L; + public static final long serialVersionUID = 5344590290956059904L; } 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 c062c0e2ccc6..cf46c801b0e5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8399046137709721782L; + public static final long serialVersionUID = -8399046864725484772L; } 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 3649db14541c..957de9f659c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -860913848080246824L; + public static final long serialVersionUID = -860914575090601970L; /** @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 d4a9983e935b..d819a256152c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954148173486759218L; + public static final long serialVersionUID = 954148730038220260L; /** @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 df6067779a22..f2b21356c346 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6934984867755974775L; + public static final long serialVersionUID = 6934989766361971617L; } 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 73e026d44900..e9522a1b6bbc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5414543725226334187L; + public static final long serialVersionUID = 5414537543049870141L; } 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 e5b74f9b4ca5..deca7bc9a255 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190248366570395444L; + public static final long serialVersionUID = -5190250059445008024L; /** @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 2612c54ff4f6..b1d7804f3c1f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893234795722260712L; + public static final long serialVersionUID = 8893230341378360125L; /** @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 41af30a24488..65ad62c82ed7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8011811008032343117L; + public static final long serialVersionUID = -1801805417871768804L; /** @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 03909d450231..38e54f531cb6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615626741470898100L; + public static final long serialVersionUID = 4615625706804640175L; /** @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 bc605188dd18..ad6407385ef8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672593442584731612L; + public static final long serialVersionUID = 672580640186904843L; /** @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 a91c97fa0768..123e4372e559 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654437673522726598L; + public static final long serialVersionUID = 8654442293327847851L; } 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 a12c4c49ef41..032faba3f9c3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694620512732488202L; + public static final long serialVersionUID = 3694613364700016359L; } 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 0d8fadf5e672..21902d29cebc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159701017218805620L; + public static final long serialVersionUID = 2159705437666324953L; } 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 f91255a8c9f9..71754844b4a7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241678604755498961L; + public static final long serialVersionUID = 1241671978161905924L; } 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 48b7e19e51cf..7875237a3477 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -7508674288709408182L; + public static final long serialVersionUID = 6838551735025053797L; } 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 a2a9c4abdc4e..5f36886a56a1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3959166640181219492L; + public static final long serialVersionUID = -8677668952079898396L; } 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 838e16468989..63927c35c5ef 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2979381471610083995L; + public static final long serialVersionUID = 5493578789762272421L; /** @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 e9e723f2ff21..b5e5dd9371a3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - public static final long serialVersionUID = 3155977118133896723L; + public static final long serialVersionUID = 7077585516992147027L; } 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 5f2563ca4426..913674453869 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6070941683534507667L; + public static final long serialVersionUID = -866533791028289259L; } 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 6daddad5352b..01c6da91486b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8447094309287824402L; + public static final long serialVersionUID = 8509607702355445268L; /** @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 d1d2ec24c349..de8d1df37356 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - public static final long serialVersionUID = -3502592297805322332L; + public static final long serialVersionUID = 1895583480473470498L; } 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 864a5b993e6e..7fd8094a682d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023082684598205L; + public static final long serialVersionUID = -477023780219773800L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java index fa4bbe140c34..a25aef9f2eb4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435630433629900153L; + public static final long serialVersionUID = -8435636751642737060L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java index 4159cec986e9..b160802bd2ad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485209532619721701L; + public static final long serialVersionUID = 3485214445530026174L; } 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 d453c4348504..8039ab041ee6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377360905998100L; + public static final long serialVersionUID = 1717377893000449487L; } 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 e07ecaee00cd..a337f4538276 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384912376922768435L; + public static final long serialVersionUID = -7384918534812403050L; } 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 aad8cfd71f6b..db8aa55f44a4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733708928625515128L; + public static final long serialVersionUID = -2733707074077883309L; } 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 7291273e7034..e5d68a35e4a9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528102258063453889L; + public static final long serialVersionUID = 4528096100201714074L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java index b83db7d43ea6..688b7ceb0439 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137357742804497499L; + public static final long serialVersionUID = 6137358274979435458L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java index 829ac3caa3eb..d101cd4b90c0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751745416375885051L; + public static final long serialVersionUID = 751740663859145954L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java index a0a3be559ef2..d326595238c8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272737871086156167L; + public static final long serialVersionUID = -4272734280649137374L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java index 13d39a90c68e..3fd8d49344e8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477020477867443102L; + public static final long serialVersionUID = -477019528546217670L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java index ea53fa14a25d..e165a450ec4c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435638739143347034L; + public static final long serialVersionUID = -8435632499978380802L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java index cdd2412e62c4..d58dab735603 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485217923365454468L; + public static final long serialVersionUID = 3485212921441420636L; } 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 b3848c74dc96..70b1ac4489e1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717374425320966389L; + public static final long serialVersionUID = 1717373806786451757L; } 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 028ac77ff64c..3c537346e46d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384915227275514260L; + public static final long serialVersionUID = -7384914443290083660L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java index 4874e646481f..f6bfa7389d6d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733711864210546839L; + public static final long serialVersionUID = -2733711160291881039L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java index ab3eaf5c65c5..93b59b25a299 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528099407710708064L; + public static final long serialVersionUID = 4528100191724033464L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java index d60ed28ac415..4949a1e2963d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612517954972657513L; + public static final long serialVersionUID = 6612524194175593715L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java index 93392b31ef45..d0fe417fdce0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036455470562819273L; + public static final long serialVersionUID = 3036461544310657491L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java index 1fc72f407847..bef57b362e94 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691111130928397368L; + public static final long serialVersionUID = 691104971990775776L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java index 92912c1a67d7..5b44a07531cb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424367411915854817L; + public static final long serialVersionUID = 3424368115853494329L; } 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 2ee9e81b40e9..81eabc4d2301 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172601329879748112L; + public static final long serialVersionUID = -1172601868329655768L; } 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 069afef5b82b..631aca7438c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126116364537154807L; + public static final long serialVersionUID = -1126115991386226095L; } 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 51abf4f04802..1ed012438b11 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097586325482864151L; + public static final long serialVersionUID = -2097585621564198351L; } 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 374391805cd6..13ab35436e45 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477019687479597525L; + public static final long serialVersionUID = -477021959259570284L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java index e595e8480c34..4c36ae95a389 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435632328296099985L; + public static final long serialVersionUID = -8435639900250982064L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java index d97dd050d1af..e13a7b81faf9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485213082948499405L; + public static final long serialVersionUID = 3485211302087648690L; } 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 e8edd771f44a..99a43cc6f822 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717373965719971004L; + public static final long serialVersionUID = 1717375906713372227L; } 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 d7d3de5fd5c7..3f5aecce9f37 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384914276773530971L; + public static final long serialVersionUID = -7384921843543706854L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java index 6b3b3cebfef2..ed5fb18ac2a0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733711331974194656L; + public static final long serialVersionUID = -2733710703102739489L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java index 249e344859df..9d0435d79c89 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528100027624786089L; + public static final long serialVersionUID = 4528092471157884182L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java index c156876a8edf..5ae8bfbbd889 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612524035249215171L; + public static final long serialVersionUID = 6612516473580688365L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java index d6e51d46490d..7ab2c238e161 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036461380370213411L; + public static final long serialVersionUID = 3036464894487521869L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java index cce0207aee1d..5e801b9d3aad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691104807891421809L; + public static final long serialVersionUID = 691104194375401550L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java index 35a2d6c86b45..dbfd72eabbf8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424367944171180712L; + public static final long serialVersionUID = 3424368573023662167L; } 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 58cc7e5d5b20..2d7d6299bb5a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172602032428870343L; + public static final long serialVersionUID = -1172608266432604794L; } 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 dba604e49bf4..438297b2c58c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126116158059344576L; + public static final long serialVersionUID = -1126115198420291585L; } 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 929fbe7d793a..16e6c82a76db 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097585793246511968L; + public static final long serialVersionUID = -2097585164375056801L; } 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 3c051677f694..fc0f7db71acb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4462284941716302736L; + public static final long serialVersionUID = -150768180215850544L; /** @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 9b9feadc4b87..5a948ed826a9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -8997614337819472676L; + public static final long serialVersionUID = -6866874489691512548L; } 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 78d3f9777011..1195bddb51af 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6397003843369558438L; + public static final long serialVersionUID = -6397001314978918820L; /** @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 c8f6749598bf..7b81a27ee161 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066882124967178673L; + public static final long serialVersionUID = -9066884570855602993L; /** @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 2d08bf8f6f3f..f7168f73e88c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5852899818504671501L; + public static final long serialVersionUID = 3163502854111524083L; /** @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 dd9ffb244f33..ef0d90a34d87 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 286356668909223345L; + public static final long serialVersionUID = 5398638832677389745L; /** @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 34da26ed4e8e..64c69e6c55ce 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1470191951985437857L; + public static final long serialVersionUID = 8991740469462764946L; } 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 6d98dc5c0dd2..27d13e2fe87c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655916988856260761L; + public static final long serialVersionUID = -7655930589482205520L; /** @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 4e7bff5052d2..9818e343173d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271134874859441715L; + public static final long serialVersionUID = -2271121435843467341L; /** @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 9b10de6be7ff..ef2729d6c120 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481707051065324989L; + public static final long serialVersionUID = 481709579603245435L; /** @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 d90150bef466..c2851da8cd0f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426894325664771430L; + public static final long serialVersionUID = -4426880886649133924L; /** @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 354c6a1ca45f..479cd89f8ec4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850546036102418208L; + public static final long serialVersionUID = 850537886944242790L; /** @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 cb52cf8eb1a0..e9f42b5596b7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328903580283140924L; + public static final long serialVersionUID = -4328906105115512105L; /** @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 69380bf9238e..d39f9092d4bb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081816427890405446L; + public static final long serialVersionUID = -5081803076699045892L; /** @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 8258b6941a98..50593b92f987 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643076171703505992L; + public static final long serialVersionUID = 643089693524828232L; /** @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 a7c54a0d0f75..6ae2446e2e66 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438006960410428368L; + public static final long serialVersionUID = -2437999060681523254L; /** @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 e3b3c1133249..300fc17d171f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651522558547905331L; + public static final long serialVersionUID = 3651535997398014965L; /** @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 10c68b53743e..6e96cfd2ac9f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804372965643099926L; + public static final long serialVersionUID = 8804375897284559056L; /** @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 7043a7f29d51..f45e743f7104 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353755021984719840L; + public static final long serialVersionUID = -5353758036275598490L; /** @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 1101ba6982e7..66c7b79a3aa3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522130423659961522L; + public static final long serialVersionUID = -6522143779869925176L; /** @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 d65f53412e08..d5767a3fe95b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620289393157376717L; + public static final long serialVersionUID = 7620281414468307787L; /** @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 4edcece0a7af..e883cfca013e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -4601643592090661298L; + public static final long serialVersionUID = -7803645206760559544L; } 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 efb96db70610..8ad28e3ae43f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2247970326334538784L; + public static final long serialVersionUID = -8749736947285236390L; /** @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 207deac45396..eb42fa1565fb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 7147341834633850028L; + public static final long serialVersionUID = 3064144777063849622L; } 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 01fb84ac6766..6df524c3ef75 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066889823483780795L; + public static final long serialVersionUID = -9066881396726523273L; /** @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 a4f2c57a8b35..b3c812e5817f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7713276922895708413L; + public static final long serialVersionUID = 5824737789467229529L; /** @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 dd73a1332b8e..06c7947f904d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5540565649117962784L; + public static final long serialVersionUID = 1035736441528719546L; /** @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 8769af3838d1..0e8082e8f8ae 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7307535993268212941L; + public static final long serialVersionUID = 4130786942149403635L; /** @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 21b07e72f231..89c37cae0468 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6564612847234490832L; + public static final long serialVersionUID = 2672960414358344583L; } 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 04772a1d31c8..0f4b13b37519 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655930947147121764L; + public static final long serialVersionUID = -7655922517805346945L; /** @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 0e3bb7af391f..abd6af8679d6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271120912723135695L; + public static final long serialVersionUID = -2271129342059053616L; /** @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 b257830d4ae4..6adf1d2a29dd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4147520813898199282L; + public static final long serialVersionUID = 4147529243150733176L; /** @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 f9b925d4bdb7..dad451258809 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481717045672170685L; + public static final long serialVersionUID = 481708616232154551L; /** @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 289966a13a8a..1f69458bda9d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643087321022522306L; + public static final long serialVersionUID = 643078894265297456L; /** @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 9669ec4569eb..808df79c81d6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438004718365919226L; + public static final long serialVersionUID = -2438007519814859667L; /** @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 4703a28362e6..dd85e9047f57 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7049497006423212660L; + public static final long serialVersionUID = -4036848504121204023L; /** @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 f7b64ea933a4..d45424032a65 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8813712673395108378L; + public static final long serialVersionUID = -8813709864523313452L; /** @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 b4f33c6c14d3..07584d489858 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410700025505187098L; + public static final long serialVersionUID = 4410691603754609390L; } 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 8ecf1cb8f5e9..a48e9af8a814 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651537202424531595L; + public static final long serialVersionUID = 3651528773072989094L; /** @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 c19835758d1a..c7bb474f2196 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804373886387571502L; + public static final long serialVersionUID = 8804376690236633219L; /** @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 bb7c6c0b834e..d4f4dc062b66 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4989058518547865173L; + public static final long serialVersionUID = -4989066942885477306L; /** @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 d1c162eb39b9..157059147ce9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353758073644439080L; + public static final long serialVersionUID = -5353760874927103691L; /** @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 f38fa720e3b9..91e0e7303793 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522143060617251770L; + public static final long serialVersionUID = -6522134633764834155L; /** @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 5ee184f6c7bc..3e0b5ddfa54b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620285024026223941L; + public static final long serialVersionUID = 7620287827834226454L; /** @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 9e6c7a9183b0..eae269edf67b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = 7249476865406407907L; + public static final long serialVersionUID = -7168366918249324602L; } 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 bbc2228dd5cb..afe21e80e949 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5730386278484312991L; + public static final long serialVersionUID = 6152511381365926036L; /** @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 6b370d42501c..915200538738 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6299164013156868655L; + public static final long serialVersionUID = 7224284523263479553L; } 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 679c3052dd66..f28ef7a111cc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9189983314172477095L; + public static final long serialVersionUID = -4526386887808530118L; /** @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 74794a2a683d..5afd25fc651e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -3229053078279232661L; + public static final long serialVersionUID = -2430558443640549002L; } 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 cf6ab005f5e7..1ecec1a054ce 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4133096818846905092L; + public static final long serialVersionUID = -7645248673225741639L; /** @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 abb51962dd65..b1fb1b5c4b4f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2515241501413416935L; + public static final long serialVersionUID = -8467119706763700070L; /** @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 b218f1613eab..f1e3b9062b32 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7862999487120499955L; + public static final long serialVersionUID = -3704857739126837645L; /** @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 79d22c962cdc..659481f5e99b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3728516078450423806L; + public static final long serialVersionUID = -4288048548811151281L; } 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 ddaeec59fdea..5efa16207d8d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655923253934013379L; + public static final long serialVersionUID = -7655926576805404502L; /** @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 340560bd1be7..c20982213b62 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271128771421980437L; + public static final long serialVersionUID = -2271125283197807108L; /** @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 1c8a77836ef7..6bf9e5211da2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4147528506951949747L; + public static final long serialVersionUID = 4147525184247615212L; /** @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 345c86ea10dd..eea462235dd1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481708982949163516L; + public static final long serialVersionUID = 481705732396635683L; /** @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 a8e799a9d1a9..3e16c71f0637 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643079710437011302L; + public static final long serialVersionUID = 643077495386774519L; /** @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 0663fda3bf74..d6149693b235 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438007759974304011L; + public static final long serialVersionUID = -2438005637989219882L; /** @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 4406e3f716bb..44b4b691a5c5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2248173208790298863L; + public static final long serialVersionUID = 6174361674542791186L; /** @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 a41075e4ffa1..c8734634cbe1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8813709709592391166L; + public static final long serialVersionUID = -8813706298562109165L; /** @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 0ce182df4fee..fb9c82c25c35 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410691407304998241L; + public static final long serialVersionUID = 4410694807979369791L; } 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 7bf2ff2625b1..05d082608577 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651528662008583137L; + public static final long serialVersionUID = 3651532150198083144L; /** @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 2332f8ac1451..2e083a98013a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804376494094034756L; + public static final long serialVersionUID = 8804374289333391469L; /** @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 7735c49ea68b..6863cb360110 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4989066888489911039L; + public static final long serialVersionUID = -4989069025930418968L; /** @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 44220ba49c2d..670540271af4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353761280592178190L; + public static final long serialVersionUID = -5353764613624705509L; /** @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 c6edb58d02fb..6926bc035b96 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522135080541584712L; + public static final long serialVersionUID = -6522131747407321084L; /** @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 f2ae1494534f..57dd64c882ef 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620287466439185915L; + public static final long serialVersionUID = 7620290716921586055L; /** @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 6f96b87e286e..36baa12485f4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -2078524897905123506L; + public static final long serialVersionUID = -5943827499203709180L; } 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 9603ba3f3e36..ffcf8f938f35 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6878422487703078746L; + public static final long serialVersionUID = -1234688866746236428L; /** @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 02afe97c7b40..7f0fe45e90ad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8247291835847719049L; + public static final long serialVersionUID = 4034662261240322506L; } 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 37efdeecfdb4..4ee31d27c767 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java @@ -88,7 +88,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6318669747091528518L; + public static final long serialVersionUID = -6178094274299644506L; /** @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 8c2983766b0f..d46b881ad1f2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734230050731542317L; + public static final long serialVersionUID = 5734226499133073114L; } 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 5159f69131bb..82cf5626d819 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java @@ -906,7 +906,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9153980944347870062L; + public static final long serialVersionUID = -2852079045829405801L; /** @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 037c7a7b2a42..1c1e838c5549 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - public static final long serialVersionUID = 3354766924828262608L; + public static final long serialVersionUID = -3744423620330047152L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java index 94498a56c4df..d126d7b43edd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/SmallStruct.java @@ -266,5 +266,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = -1202842437858447317L; + public static final long serialVersionUID = 3302441158100068737L; } 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 e52239a87599..980151799ca2 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -693834209914696641L; + public static final long serialVersionUID = -970378247743237016L; /** @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 387742875276..48ba532a1acd 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java @@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6047572366845462071L; + public static final long serialVersionUID = -7335629916242284255L; } 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 91380c02d7dc..cf03026115dd 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = -5306039260515616339L; + public static final long serialVersionUID = -5721835342331560809L; } 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 2b7694e4ac99..63282fae8243 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - public static final long serialVersionUID = -943489679849254722L; + public static final long serialVersionUID = -943486328417680495L; } 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 6bab8a481250..f7905f0eee78 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2700447687628798286L; + public static final long serialVersionUID = -7014645547935030906L; /** @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 b506428fda5c..683bb48276e6 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2944658083318547771L; + public static final long serialVersionUID = -2944661434754713238L; } 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 a66afd9528af..8d778cd22e0f 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -193012717727247817L; + public static final long serialVersionUID = 5725027001300540663L; } 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 d7b6ba8fbbf2..45ab333e84fa 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8006408111143799838L; + public static final long serialVersionUID = -670226871923673954L; /** @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 315f1d7de6a5..22a65950c835 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7883242997716869426L; + public static final long serialVersionUID = -4722277646803488526L; /** @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 706d3c6130e6..789b074633af 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7861146255574914047L; + public static final long serialVersionUID = 7698537305488881535L; /** @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 2ed3bfb39001..1991e1d6f715 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3172275248938277608L; + public static final long serialVersionUID = -3172273346537093721L; /** @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 79ed94b30602..a616cdd81f2e 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = -5542862845338714961L; + public static final long serialVersionUID = -5542866072799554969L; } 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 20fe985a3e42..6a0d769d4751 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java @@ -289,5 +289,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 784747790608556550L; + public static final long serialVersionUID = -6376755532626398859L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index 76b89ae08095..c58067a2b1d2 100644 --- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3895381758322168941L; + public static final long serialVersionUID = -2375624772049153247L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index 751f65fbbbaa..4e84ef29a34a 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3115755644942514133L; + public static final long serialVersionUID = -8825735665565386838L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index 0eb7fcd45c05..df2389353360 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8432560059932397857L; + public static final long serialVersionUID = -2523747431397383970L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index 7f8c6ea4635c..289885057e3e 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1366008742485568842L; + public static final long serialVersionUID = 2947713275505988490L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 86d602ea7521..c250f089f896 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -82766495163511624L; + public static final long serialVersionUID = -5417681050986846762L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index 2d4dc065bb14..2ecbc47825cb 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8448298467818836217L; + public static final long serialVersionUID = -741917280306408999L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index 8370987f2e6d..3b333e999cfb 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7881584796382617680L; + public static final long serialVersionUID = -3336817270084073490L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index ed9d3bb6b60b..7b26775b2f02 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3940397615960912722L; + public static final long serialVersionUID = 7834135045458999278L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 7969d6cbb455..f2c7c3e190a7 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8177453719940380984L; + public static final long serialVersionUID = -4298523781381617178L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index ef873c04660f..cd288f08727b 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127391406455185894L; + public static final long serialVersionUID = 5127390325272083233L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index 6c47ded86f13..8a05ff13514a 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = -3524534373723463764L; + public static final long serialVersionUID = 1173480238450932243L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index 8c54cdda462e..53a37aed0c0d 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = 779105015986718047L; + public static final long serialVersionUID = -2357959636103130886L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 2baebe789bc4..bc81c13e2504 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - public static final long serialVersionUID = 1631286216264468910L; + public static final long serialVersionUID = 6561816392059852689L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index 1f512f25592f..cdddec7f4926 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = -1851226379977853041L; + public static final long serialVersionUID = -5966956524229806911L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index 20801ea69c0e..3c5ec5f6a7e3 100644 --- a/slice2java/js/test/Ice/exceptions/Test/A.java +++ b/slice2java/js/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823738592295069542L; + public static final long serialVersionUID = 7823743378430053149L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index ffec104149a0..d0075982cee3 100644 --- a/slice2java/js/test/Ice/exceptions/Test/B.java +++ b/slice2java/js/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861417471520106842L; + public static final long serialVersionUID = -3861407064769463331L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index 3b2626934519..9c9ac45bd698 100644 --- a/slice2java/js/test/Ice/exceptions/Test/C.java +++ b/slice2java/js/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080692283497854822L; + public static final long serialVersionUID = 1080697069632838429L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index b50afea661f2..97191909882a 100644 --- a/slice2java/js/test/Ice/exceptions/Test/D.java +++ b/slice2java/js/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780374796581971366L; + public static final long serialVersionUID = 4780385203332614877L; } diff --git a/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java b/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java index 66391d4ce83f..8a6a76b1e736 100644 --- a/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java +++ b/slice2java/js/test/Ice/import/Demo/Demo/gx/Circle.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final Circle _nullMarshalValue = new Circle(); /** @hidden */ - public static final long serialVersionUID = 8185215575557248813L; + public static final long serialVersionUID = -4400904907474008462L; } diff --git a/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java b/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java index d8f558f5e9cf..e91d7f712a3f 100644 --- a/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java +++ b/slice2java/js/test/Ice/import/Demo/Demo/gx/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - public static final long serialVersionUID = -4557622006739040518L; + public static final long serialVersionUID = -52160375762683398L; } diff --git a/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java b/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java index 0efc2315084e..20069661959d 100644 --- a/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java +++ b/slice2java/js/test/Ice/import/Demo/Demo/gx/Square.java @@ -184,5 +184,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final Square _nullMarshalValue = new Square(); /** @hidden */ - public static final long serialVersionUID = -1305397610791240014L; + public static final long serialVersionUID = -5112688164448528974L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index 28ed985267b0..636002466c1b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954232857718892519L; + public static final long serialVersionUID = 954223348723380248L; /** @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 f3c8f8ec481c..88256b53868f 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1339629623200737661L; + public static final long serialVersionUID = 1339631024526722050L; /** @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 8e1527787719..a71dfc040d3b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2729305037612870785L; + public static final long serialVersionUID = -2729314546608432256L; /** @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 38d7edc68901..9af47fc76f3c 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3435402236105290375L; + public static final long serialVersionUID = -3435401155082337018L; /** @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 856876f3bcb4..e62250c74720 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -836177795641842656L; + public static final long serialVersionUID = -836179196967404641L; /** @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 58a406db9932..9cc6b2dc0359 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1132523881019227037L; + public static final long serialVersionUID = 1132525607652546082L; /** @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 78069ffc8514..176d9056adc5 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6335559330269750625L; + public static final long serialVersionUID = -6335557603636575328L; /** @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 616173d45873..0ca6184c6077 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4007408481905340775L; + public static final long serialVersionUID = -4007407075575052762L; /** @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 c66822e2a68e..dbe5c0e2e228 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 991426680509483489L; + public static final long serialVersionUID = 991427761532486046L; /** @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 2ea7e4555511..ed32a5f59d68 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2880333033771673283L; + public static final long serialVersionUID = -2880342212455025854L; /** @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 efcd2a555e7c..6a57b9f46f8e 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8808271820300107201L; + public static final long serialVersionUID = -8808270088662201408L; /** @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 a2ea5cb5bb53..75528cf90f04 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -771851692520255943L; + public static final long serialVersionUID = -771861191506639546L; /** @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 ae3d77eb3326..b0b96d439d60 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6566352640666377250L; + public static final long serialVersionUID = 6566362149662073629L; /** @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 3306c07b1317..6dbb613adfcb 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6983795505991182429L; + public static final long serialVersionUID = 6983796902312157794L; /** @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 9b1ef666143a..6316c5858cbe 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1175217889340084897L; + public static final long serialVersionUID = -1175216493019253280L; /** @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 8c13a4192ee6..c85a4f4fe7f0 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3279722069950362023L; + public static final long serialVersionUID = -3279720993932417690L; /** @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 d16973d46fa8..fa10227756a8 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4359168232380153373L; + public static final long serialVersionUID = -4359178061678696676L; /** @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 822d5edc868d..caff68300271 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5904686410752125693L; + public static final long serialVersionUID = 5904687812078110082L; /** @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 b09da9059c91..6be67449574b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1835751749938517247L; + public static final long serialVersionUID = 1835742240942955776L; /** @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 15ba7bab6b4e..d3e0d26d4248 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2252402889335607559L; + public static final long serialVersionUID = -2252401808312654202L; /** @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 904310630299..43953c7bf3e9 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1203536548589329364L; + public static final long serialVersionUID = -1203537629611876717L; /** @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 080e804631ed..bc76ddd83969 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7537768150568058083L; + public static final long serialVersionUID = -7537766423934739038L; /** @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 74f1f2f16848..2e43c46cc4ba 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3440892711852515871L; + public static final long serialVersionUID = 3440894438485691168L; /** @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 956ff0df78c8..81774beccfcd 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9151101000998630937L; + public static final long serialVersionUID = 9151102407328918950L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index de581da33bf2..50d6397f307b 100644 --- a/slice2java/js/test/Ice/objects/Test/A.java +++ b/slice2java/js/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7724371576422233534L; + public static final long serialVersionUID = -3934352008771385141L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index 33d41671d5ff..81f6a0722c16 100644 --- a/slice2java/js/test/Ice/objects/Test/A1.java +++ b/slice2java/js/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926746083116807756L; + public static final long serialVersionUID = -5926744158821177352L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index 8e59d301f4de..da532288a0fa 100644 --- a/slice2java/js/test/Ice/objects/Test/B.java +++ b/slice2java/js/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890918448665272149L; + public static final long serialVersionUID = -8890915163262622498L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index 7c4f194766ec..dc0f0302ecd1 100644 --- a/slice2java/js/test/Ice/objects/Test/B1.java +++ b/slice2java/js/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7273317371935843780L; + public static final long serialVersionUID = -1933602129958270524L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index 4743ad7ddc75..f3d2324fd9fe 100644 --- a/slice2java/js/test/Ice/objects/Test/Base.java +++ b/slice2java/js/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7758641105195974954L; + public static final long serialVersionUID = -3666184523750489305L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index 468409fd22d1..397ad1d02570 100644 --- a/slice2java/js/test/Ice/objects/Test/C.java +++ b/slice2java/js/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -720886364588111944L; + public static final long serialVersionUID = 7940978381940666224L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index ca79fef6eff0..1f5218a0390a 100644 --- a/slice2java/js/test/Ice/objects/Test/COneMember.java +++ b/slice2java/js/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050977299581044309L; + public static final long serialVersionUID = 3050979469414595184L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index 73a808600ecf..e198ff94cb63 100644 --- a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 46595050274718939L; + public static final long serialVersionUID = -7739501643809287141L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index 98468b7a6cce..75202b050e5b 100644 --- a/slice2java/js/test/Ice/objects/Test/D.java +++ b/slice2java/js/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7653437180960446161L; + public static final long serialVersionUID = 4514273021273622513L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index 18745648dbd4..75fac78aa677 100644 --- a/slice2java/js/test/Ice/objects/Test/D1.java +++ b/slice2java/js/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5896000721429323773L; + public static final long serialVersionUID = 5720350806582609155L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index 0b805d3f2056..0375a8b81529 100644 --- a/slice2java/js/test/Ice/objects/Test/E.java +++ b/slice2java/js/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8964269805123008629L; + public static final long serialVersionUID = 3553819470816328676L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index 09104e707453..c6e863667dd1 100644 --- a/slice2java/js/test/Ice/objects/Test/EBase.java +++ b/slice2java/js/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 1439934679626557326L; + public static final long serialVersionUID = -673025658084691570L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index 6d58c2ecad35..bfc69555a5dd 100644 --- a/slice2java/js/test/Ice/objects/Test/EDerived.java +++ b/slice2java/js/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8121823445303117842L; + public static final long serialVersionUID = -6251056259650405230L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index cb9bbda31cd3..0811e501b2ad 100644 --- a/slice2java/js/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225292443104730278L; + public static final long serialVersionUID = -6225290188333441857L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index 3252a217a1e8..86008dfb1aa5 100644 --- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -3452815234889937836L; + public static final long serialVersionUID = 6519269821563884948L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index 8aaed79462ac..d7a63f623877 100644 --- a/slice2java/js/test/Ice/objects/Test/F.java +++ b/slice2java/js/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 579716169011812817L; + public static final long serialVersionUID = -3504501004354850735L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index 232f0c0e28dc..a82aa6210cf9 100644 --- a/slice2java/js/test/Ice/objects/Test/F1.java +++ b/slice2java/js/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192369263077684232L; + public static final long serialVersionUID = 6192371963478943992L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index 04a6631a1641..99cb2bece0ce 100644 --- a/slice2java/js/test/Ice/objects/Test/F3.java +++ b/slice2java/js/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4839499568278100675L; + public static final long serialVersionUID = -4166442128801224507L; /** @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 2507d28e3ba9..06657d53f037 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425261075858850495L; + public static final long serialVersionUID = -1425257790157344524L; /** @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 853855c8a94c..6f3816538de0 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337229235876603251L; + public static final long serialVersionUID = -2337226035627184319L; } 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 2eaad8736bdf..dd17d2b9072c 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298688808622549699L; + public static final long serialVersionUID = -1298676029368830992L; /** @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 f49caf5a71b9..f15316727461 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842238388708033321L; + public static final long serialVersionUID = 1842241919720162789L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index 96171ce3bad3..4b3fc4c5dae8 100644 --- a/slice2java/js/test/Ice/objects/Test/K.java +++ b/slice2java/js/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645160302209619308L; + public static final long serialVersionUID = 4645159784285094421L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index c375c22c0b74..aa5d59e02efd 100644 --- a/slice2java/js/test/Ice/objects/Test/L.java +++ b/slice2java/js/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629739249458227135L; + public static final long serialVersionUID = 6629735963964598899L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index 704f6db86c30..f6d58243b5b7 100644 --- a/slice2java/js/test/Ice/objects/Test/M.java +++ b/slice2java/js/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088101321839612244L; + public static final long serialVersionUID = -8088100572895624376L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 7e4e8a7f519a..debe87836206 100644 --- a/slice2java/js/test/Ice/objects/Test/Recursive.java +++ b/slice2java/js/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617887297633733561L; + public static final long serialVersionUID = 3617875549084946108L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index c4747107a2b7..abbe59e56d76 100644 --- a/slice2java/js/test/Ice/objects/Test/S.java +++ b/slice2java/js/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481771898062584332L; + public static final long serialVersionUID = 481769728390485952L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index ad9abb2a0388..887affe0417f 100644 --- a/slice2java/js/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227753214062205900L; + public static final long serialVersionUID = 6227751375143598889L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index b50f9f065609..1f2f4a93fbde 100644 --- a/slice2java/js/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -7595868998765246270L; + public static final long serialVersionUID = 678809148136645122L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index 9bd99617bb1a..6548f447ea40 100644 --- a/slice2java/js/test/Ice/objects/Test/StructKey.java +++ b/slice2java/js/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 7893364305264900551L; + public static final long serialVersionUID = -3099514437157849304L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 0d6a6490c262..bf0db275cb49 100644 --- a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723843748999734513L; + public static final long serialVersionUID = 2723843604361578354L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index 8764fbfce94c..51694e1cd60e 100644 --- a/slice2java/js/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/js/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3382056837749378131L; + public static final long serialVersionUID = 8632273064372135946L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index 20c67603aed8..c170e32936f1 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = -5726456856221268227L; + public static final long serialVersionUID = -5555483310996491075L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index b63cf4c7dff5..efde86694861 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = 81343389724351780L; + public static final long serialVersionUID = 4382676584924602947L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index dbd4c75b5982..21d87e81cc4e 100644 --- a/slice2java/js/test/Ice/operations/Test/Structure.java +++ b/slice2java/js/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = -7567233132426818736L; + public static final long serialVersionUID = -6768257719198241810L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index d2ffcec7c96f..f3c4c2de71fd 100644 --- a/slice2java/js/test/Ice/optional/Test/A.java +++ b/slice2java/js/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 173990820065773328L; + public static final long serialVersionUID = 8411694176970909584L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index 561d2ccc1685..972a6f946902 100644 --- a/slice2java/js/test/Ice/optional/Test/B.java +++ b/slice2java/js/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3544500635277553059L; + public static final long serialVersionUID = 7073642647736196579L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index 78e7ab5c8caf..d90355b35ec8 100644 --- a/slice2java/js/test/Ice/optional/Test/C.java +++ b/slice2java/js/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5408744861006401667L; + public static final long serialVersionUID = 4212156814642818429L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java index 349d60b15208..be2311e533d2 100644 --- a/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/js/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359994566870652271L; + public static final long serialVersionUID = 4360002704336937100L; } diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index 3d70d920eb5d..8718b58c80b5 100644 --- a/slice2java/js/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6116714110755392689L; + public static final long serialVersionUID = -8811846810036336527L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index 00a8757311d1..4b897c79485a 100644 --- a/slice2java/js/test/Ice/optional/Test/E.java +++ b/slice2java/js/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399099809013090679L; + public static final long serialVersionUID = 4399097286622118932L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index 5a21336995eb..0f58d78baff8 100644 --- a/slice2java/js/test/Ice/optional/Test/F.java +++ b/slice2java/js/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111949251188162884L; + public static final long serialVersionUID = 2111940863257732263L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index 98649aeb1f06..929216d189b5 100644 --- a/slice2java/js/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/js/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569605302579374174L; + public static final long serialVersionUID = 1569613690737499197L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index 047f494d3372..c25eaaa1071c 100644 --- a/slice2java/js/test/Ice/optional/Test/G.java +++ b/slice2java/js/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5919111053330285421L; + public static final long serialVersionUID = 8992792904022539667L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index 795723465ab7..baa027eeb1a3 100644 --- a/slice2java/js/test/Ice/optional/Test/G1.java +++ b/slice2java/js/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356164904505553194L; + public static final long serialVersionUID = -356162297112438283L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index cca077edce94..c95d772d1edc 100644 --- a/slice2java/js/test/Ice/optional/Test/G2.java +++ b/slice2java/js/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44033313455019558L; + public static final long serialVersionUID = 44041451077560901L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index 56e89e02cb2c..fe2294dff45d 100644 --- a/slice2java/js/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6918912107510385858L; + public static final long serialVersionUID = 6504776810192252674L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index 4120700dac30..0534b897c8ee 100644 --- a/slice2java/js/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/js/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219600419689114128L; + public static final long serialVersionUID = -7219608722614957613L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index 8fa0311c3514..7c7164f99e9e 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4012772266736752043L; + public static final long serialVersionUID = -691380552191202773L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index a6fe00277709..1d935d9a1013 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1086031813988567145L; + public static final long serialVersionUID = 1353856554296234420L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/Recursive.java b/slice2java/js/test/Ice/optional/Test/Recursive.java index 0f71554e8c12..5add724b152c 100644 --- a/slice2java/js/test/Ice/optional/Test/Recursive.java +++ b/slice2java/js/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055423639723238873L; + public static final long serialVersionUID = 9055421117718735802L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index 8a0c095b6d2b..bb9ae61b2865 100644 --- a/slice2java/js/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8663646895306191798L; + public static final long serialVersionUID = -2010229433945862730L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index ece411e4a22b..bcd20f44e109 100644 --- a/slice2java/js/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/js/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700983648298431808L; + public static final long serialVersionUID = 6700991951224277475L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index 48f7151c1c70..f92129af173c 100644 --- a/slice2java/js/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/js/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912288347872817033L; + public static final long serialVersionUID = -1912285660256746412L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index 94fa8daea854..a99c3da7c26b 100644 --- a/slice2java/js/test/Ice/optional/Test/WD.java +++ b/slice2java/js/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5467768593293683953L; + public static final long serialVersionUID = 6262201580733883055L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index fe4858b9f85f..80905132c358 100644 --- a/slice2java/js/test/Ice/scope/Test/C.java +++ b/slice2java/js/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190251556334304800L; + public static final long serialVersionUID = -5190250098343868558L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index aa65e045c242..055d1f692926 100644 --- a/slice2java/js/test/Ice/scope/Test/C1.java +++ b/slice2java/js/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893231693624154838L; + public static final long serialVersionUID = 8893230545434686417L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index fb1ea0965e11..f3d59c72bf2a 100644 --- a/slice2java/js/test/Ice/scope/Test/C2.java +++ b/slice2java/js/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1460081123379006292L; + public static final long serialVersionUID = 8060811393670254579L; /** @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 5a64df7ed1fb..793c1e7b13c3 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615629847369032836L; + public static final long serialVersionUID = 4615625497887539764L; /** @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 4ac54fdbc82a..a9c8bb0651ab 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672584636078356058L; + public static final long serialVersionUID = 672580761566188881L; /** @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 54257003e686..be752c9aa98a 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654440941084807345L; + public static final long serialVersionUID = 8654442089121242509L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index cd8f0412a677..13077505c491 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694611867803641213L; + public static final long serialVersionUID = 3694613160488680385L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index e56e9279e10c..118f7d2ee80b 100644 --- a/slice2java/js/test/Ice/scope/Test/S.java +++ b/slice2java/js/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159709579482270403L; + public static final long serialVersionUID = 2159705393915810751L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index b4c03caf02a4..36d6b03744d5 100644 --- a/slice2java/js/test/Ice/scope/Test/S1.java +++ b/slice2java/js/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241675915773377391L; + public static final long serialVersionUID = 1241672265024414696L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index 63ed9a66cefb..a28058b92e48 100644 --- a/slice2java/js/test/Ice/scope/Test/S2.java +++ b/slice2java/js/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -1700061152374568875L; + public static final long serialVersionUID = -4874483710305121142L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index c5780b29363d..4fef6697e3e6 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477021548574333982L; + public static final long serialVersionUID = -477022832136960188L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java index 9396bd7b4212..4bd86da40ab8 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435640140461577434L; + public static final long serialVersionUID = -8435630513702792832L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index aa9164844d7d..f8c2253b0c76 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485210891403564548L; + public static final long serialVersionUID = 3485209612693740386L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 65e202dca885..962573712606 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717375826643796725L; + public static final long serialVersionUID = 1717377110358360083L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 316d7987ac84..d447b6098d1f 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384921923612134420L; + public static final long serialVersionUID = -7384912296853345462L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 4335fd77d0cf..162a73634f46 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733710462886601367L; + public static final long serialVersionUID = -2733709179172046705L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index b5ec815930eb..ae61cf6d94ff 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528092711374087904L; + public static final long serialVersionUID = 4528102338132868166L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index 9675101c62c2..3e5fb562c491 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2591358283341559163L; + public static final long serialVersionUID = -8356319181290816569L; /** @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 eb922e532310..73d3ddb42e0e 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -678127223413512777L; + public static final long serialVersionUID = 5990114346972414859L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index 4db5817c67b7..08f0c5d01fb4 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6397006169349340106L; + public static final long serialVersionUID = -6397005259086851246L; /** @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 68dec940cb2f..822e02c145e7 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066879798987483357L; + public static final long serialVersionUID = -9066883186588736597L; /** @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 405c3c1fa163..98e2f42014bf 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4819006073915757320L; + public static final long serialVersionUID = -1226203315098407996L; /** @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 a3000e796bb9..7d360e5aeebe 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2191791490277863366L; + public static final long serialVersionUID = 4913053007007591174L; /** @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 278a6f72055b..27f5dd8a96c4 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5063502836672347901L; + public static final long serialVersionUID = -5800671542763535263L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index f12eca2b4bf0..b874d312ae54 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655925774847765658L; + public static final long serialVersionUID = -7655926353464942695L; /** @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 b9b9977b45ab..5a7f396b0eb5 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271133029314838939L; + public static final long serialVersionUID = -2271125506442906341L; /** @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 9e57fc8f6d46..46f3c44b038b 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481704725157047040L; + public static final long serialVersionUID = 481705635464624492L; /** @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 e612c14f7902..0b6353d6af0b 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426891196479530634L; + public static final long serialVersionUID = -4426884996065105774L; /** @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 5172f4620bff..ed43cca9fcd4 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850542746703362781L; + public static final long serialVersionUID = 850536541386316785L; /** @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 0871e7fde486..9dac181ff2cf 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328899971877107551L; + public static final long serialVersionUID = -4328902034522795640L; /** @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 393bcb10dc2a..cb0db11ee1eb 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081814582322673195L; + public static final long serialVersionUID = -5081815167266972833L; /** @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 4aa45daddcff..7990fbd7a22b 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643078017245312356L; + public static final long serialVersionUID = 643077272143923692L; /** @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 2722acabe75d..54670a5731c3 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438003667440246547L; + public static final long serialVersionUID = -2438005900099990571L; /** @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 81aefc85b0a6..ed8c3d4a847c 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651524404134683036L; + public static final long serialVersionUID = 3651531926841575446L; /** @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 a1e41543d11f..c408c1558a52 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804375131527818681L; + public static final long serialVersionUID = 8804374386270714931L; /** @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 5dc9c548bc1a..9c9448da640d 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353757187845936689L; + public static final long serialVersionUID = -5353764710581002683L; /** @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 949fc36e83d8..8264b511fd13 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522133552911782622L; + public static final long serialVersionUID = -6522131650406048521L; /** @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 1fae0de48149..770d2eaf3f5e 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620286103910795105L; + public static final long serialVersionUID = 7620290979079306932L; /** @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 ad6b93cc9151..20b81bb8fe5f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = 6506174671006712521L; + public static final long serialVersionUID = 7473614666586616016L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index 3beb89a0efc6..b022ec0cc14e 100644 --- a/slice2java/js/test/Ice/stream/Test/MyClass.java +++ b/slice2java/js/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -394347053612914041L; + public static final long serialVersionUID = 912239685603142570L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index 3b9e2a7c4e08..c394666743bc 100644 --- a/slice2java/js/test/Ice/stream/Test/MyException.java +++ b/slice2java/js/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734228768465697936L; + public static final long serialVersionUID = 5734227984368936114L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 61784b53cf7b..83f6315920d1 100644 --- a/slice2java/js/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/js/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4673565768093465902L; + public static final long serialVersionUID = 61251154785813615L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/SmallStruct.java b/slice2java/js/test/Ice/stream/Test/SmallStruct.java index bc02e4665289..d8124bc16c6d 100644 --- a/slice2java/js/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/js/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = -6825859930441961467L; + public static final long serialVersionUID = 7566387241338050489L; } diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index a463a507fb0d..e3b0968012ab 100644 --- a/slice2java/js/test/Slice/escape/Clash/Cls.java +++ b/slice2java/js/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5400105711096074472L; + public static final long serialVersionUID = -4649575030896313257L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index c1c2d17cccc0..bf23ee6d7b93 100644 --- a/slice2java/js/test/Slice/escape/Clash/Ex.java +++ b/slice2java/js/test/Slice/escape/Clash/Ex.java @@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7289087940458803875L; + public static final long serialVersionUID = -6745840225147684426L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index 24926b5d98b8..62d2917b0c9e 100644 --- a/slice2java/js/test/Slice/escape/Clash/St.java +++ b/slice2java/js/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = 4904943368257478092L; + public static final long serialVersionUID = 2233712504443398042L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index 9d4a02d7e357..14faa863f7c4 100644 --- a/slice2java/js/test/Slice/escape/await/BaseMethods.java +++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java @@ -147,5 +147,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2927010269481705588L; + public static final long serialVersionUID = -8951030336728894343L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index b32982be2ad7..18574a596893 100644 --- a/slice2java/js/test/Slice/escape/await/_break.java +++ b/slice2java/js/test/Slice/escape/await/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - public static final long serialVersionUID = 7953027391623785882L; + public static final long serialVersionUID = 7953031367981881071L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index c1c52d5c68b6..f66faf71ad8d 100644 --- a/slice2java/js/test/Slice/escape/await/_package.java +++ b/slice2java/js/test/Slice/escape/await/_package.java @@ -369,7 +369,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1618758482940724768L; + public static final long serialVersionUID = -5798298480801067835L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index 58337f821560..c5c488af0c9d 100644 --- a/slice2java/js/test/Slice/escape/await/delete.java +++ b/slice2java/js/test/Slice/escape/await/delete.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1177978206077183372L; + public static final long serialVersionUID = -6221153239977053030L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index 53b47186e01b..c8f68f5f1ede 100644 --- a/slice2java/js/test/Slice/escape/await/fixed.java +++ b/slice2java/js/test/Slice/escape/await/fixed.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3808657362633921015L; + public static final long serialVersionUID = 3808658846454884866L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index a349363c01fa..cebb3452edca 100644 --- a/slice2java/js/test/Slice/escape/await/foreach.java +++ b/slice2java/js/test/Slice/escape/await/foreach.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2470338063805455625L; + public static final long serialVersionUID = 1391694983823836233L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index 7a55c266d18a..aa6a5362e3b5 100644 --- a/slice2java/js/test/Slice/macros/Test/Default.java +++ b/slice2java/js/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2415952180026025346L; + public static final long serialVersionUID = -8949214386404693058L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index dd257cd9194f..f8f4037181f5 100644 --- a/slice2java/js/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/js/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5572090983493202719L; + public static final long serialVersionUID = 9108117605276360671L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java index 79aba93cf3c0..305fda821403 100644 --- a/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java +++ b/slice2java/js/test/typescript/Glacier2/router/Test/CallbackException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5940715540667553183L; + public static final long serialVersionUID = -2614178451780853412L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java index cac74a0259f6..d7bdf372a6ef 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8061226958046963630L; + public static final long serialVersionUID = 8076445948251286461L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java index 3c5a8afef48a..8a9450bb64ed 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2376921417536928742L; + public static final long serialVersionUID = -8479897745502661687L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java index 42295347d326..19bb6002eb07 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 206094839684337096L; + public static final long serialVersionUID = 5910484023721034616L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 07b938c4546d..7cfc73ae5738 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5324306089441722291L; + public static final long serialVersionUID = 8477388554480791631L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java index ad6889f4a85b..e1c889111cc7 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6456799659041806945L; + public static final long serialVersionUID = 2251777512816228978L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java index 9768febce18a..3b53c53a85ee 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 348088325392614952L; + public static final long serialVersionUID = -5161705261363225659L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java index e3d61901a92c..760dd9ba8e11 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2116853705983971668L; + public static final long serialVersionUID = 6133324710171569628L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index fd3bad10947e..b6914e62229b 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2158042498327575299L; + public static final long serialVersionUID = -8137150533730350849L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java index 74e1df83fa68..15cc37c64b74 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127387559166418844L; + public static final long serialVersionUID = 5127390227339104616L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java index 2fdfa5508584..15b0f2dd7239 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = 4607174354151930221L; + public static final long serialVersionUID = -4184121663571932529L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java index 35f3e34d7f10..1ac8861d5d7f 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = 4429751227958329114L; + public static final long serialVersionUID = 1945890581286204589L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java index fd03048d1961..a08b9c34cf19 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - public static final long serialVersionUID = 563315133852663663L; + public static final long serialVersionUID = 8948947785189817229L; } diff --git a/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java index 086878402850..7d41761d166a 100644 --- a/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/js/test/typescript/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = -1574091892200610321L; + public static final long serialVersionUID = 5191687309060313270L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/A.java b/slice2java/js/test/typescript/Ice/exceptions/Test/A.java index 55b4c18756bf..8cd6fdfa6b18 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/A.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737223201967268L; + public static final long serialVersionUID = 7823746528457784661L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/B.java b/slice2java/js/test/typescript/Ice/exceptions/Test/B.java index 29fc110c9932..63fc0cab8f35 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/B.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418840617948188L; + public static final long serialVersionUID = -3861409370054231019L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/C.java b/slice2java/js/test/typescript/Ice/exceptions/Test/C.java index c1c6348490a6..4cb1ae5be946 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/C.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690914404752548L; + public static final long serialVersionUID = 1080700219660569941L; } diff --git a/slice2java/js/test/typescript/Ice/exceptions/Test/D.java b/slice2java/js/test/typescript/Ice/exceptions/Test/D.java index 147a6e001b38..e5e8ef87faf4 100644 --- a/slice2java/js/test/typescript/Ice/exceptions/Test/D.java +++ b/slice2java/js/test/typescript/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373427484130020L; + public static final long serialVersionUID = 4780382898047847189L; } diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java index 0b69647f78df..f917213c5cdb 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954223391415262191L; + public static final long serialVersionUID = 954233017870213041L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java index 7a5b1c88999e..fc2f77f568df 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1339631067218632437L; + public static final long serialVersionUID = 1339629783352587307L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java index 32e168f9a498..49fa852c9368 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2729314503916517513L; + public static final long serialVersionUID = -2729304877461025495L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java index 9e38ea24c9f0..e0b45e3ef1aa 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3435401112390417935L; + public static final long serialVersionUID = -3435402396256471761L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java index 934de0b9b5f2..4b0f1888b52c 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -836179239356002264L; + public static final long serialVersionUID = -836177955793687946L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java index 98ec9f96269f..a9df166f1da7 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1132525319728795669L; + public static final long serialVersionUID = 1132524041170937547L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java index 7d45ef3bdf20..8d9a5c177780 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6335557891560321385L; + public static final long serialVersionUID = -6335559170118044471L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java index d1a214bc4736..9762826520ce 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4007407363498794479L; + public static final long serialVersionUID = -4007408642056661297L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java index 1f551c29b5a8..12a4d0241926 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 991427804224372329L; + public static final long serialVersionUID = 991426520357777335L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java index 0f1735092421..1aa75a4f86b4 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2880342169762976331L; + public static final long serialVersionUID = -2880332873619962773L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java index 43611da36642..50aa091d803d 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8808270045970147529L; + public static final long serialVersionUID = -8808271660148401047L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java index bae28083e0f9..d1416dc93c89 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -771861148814581327L; + public static final long serialVersionUID = -771851852671576465L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java index 65f9754d93b3..48f25d8bacee 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6566362107273480362L; + public static final long serialVersionUID = 6566352480514527604L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java index 208561303f4c..9a2e3c366c05 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6983796944700751061L; + public static final long serialVersionUID = 6983795666143032075L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java index 040fd28f8e93..38ef7dd7b02e 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1175216450630655657L; + public static final long serialVersionUID = -1175217729188239607L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java index d09fba24be40..c8f995eddad1 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3279720951543815727L; + public static final long serialVersionUID = -3279722230101543409L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java index 24bec34a34e7..2d0efa0595c7 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4359178018986806037L; + public static final long serialVersionUID = -4359168392531863883L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java index 29234c9710ff..f0a3ffc843cd 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5904687854770020469L; + public static final long serialVersionUID = 5904686570903975339L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java index f34e8ae83307..f65d9f37a2e1 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1835742283634870519L; + public static final long serialVersionUID = 1835751910090362537L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java index 49592585143e..7b34de9ee469 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2252401765620735119L; + public static final long serialVersionUID = -2252403049486788945L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java index 720cb979d0f7..a3bed9721cdb 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1203537672000483036L; + public static final long serialVersionUID = -1203536388437586054L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java index 06796fa40f57..c3e123a23dbe 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7537766711858489451L; + public static final long serialVersionUID = -7537767990416347573L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java index 484bf97aba1c..d28ba108df51 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3440894150561945111L; + public static final long serialVersionUID = 3440892872004222025L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java index 7ae1b091560f..3da5f1912aa9 100644 --- a/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java +++ b/slice2java/js/test/typescript/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9151102119405177233L; + public static final long serialVersionUID = 9151100840847310415L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/A.java b/slice2java/js/test/typescript/Ice/objects/Test/A.java index 7fb61624ea2f..a113c90e8dda 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/A.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 487796858312490123L; + public static final long serialVersionUID = 2210054153572069917L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/A1.java b/slice2java/js/test/typescript/Ice/objects/Test/A1.java index aac32e3cbb63..bd3994c58dde 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/A1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926745380405109289L; + public static final long serialVersionUID = -5926741927164798841L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/B.java b/slice2java/js/test/typescript/Ice/objects/Test/B.java index 51820c676129..f0a609cf83f8 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/B.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890916589104782248L; + public static final long serialVersionUID = -8890920039689676433L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/B1.java b/slice2java/js/test/typescript/Ice/objects/Test/B1.java index 511491fb93f0..b5fd33ac0991 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/B1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8283682050878874492L; + public static final long serialVersionUID = -8527986264586576572L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Base.java b/slice2java/js/test/typescript/Ice/objects/Test/Base.java index 47512e63503f..166217661467 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Base.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8227388193931540868L; + public static final long serialVersionUID = 1169268255076615618L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/C.java b/slice2java/js/test/typescript/Ice/objects/Test/C.java index 8f86c75e6737..1c0392d8ab81 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/C.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7305478224152511773L; + public static final long serialVersionUID = 3671752798586103302L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java b/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java index d96d65e3fd10..ea1eb921611f 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050969824573658049L; + public static final long serialVersionUID = 3050973270365399079L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java index 0e4eab88bd21..07794d8948ca 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4236671285496093861L; + public static final long serialVersionUID = -561921474699034853L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/D.java b/slice2java/js/test/typescript/Ice/objects/Test/D.java index c699c2aafc5c..7eaf0c08890d 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/D.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3965591186710460041L; + public static final long serialVersionUID = 3845805826448686774L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/D1.java b/slice2java/js/test/typescript/Ice/objects/Test/D1.java index 38b02796151e..53969f86a7bc 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/D1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4089410899794827453L; + public static final long serialVersionUID = -1161885520320314621L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/E.java b/slice2java/js/test/typescript/Ice/objects/Test/E.java index 4f78ded7fed5..6e537100f318 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/E.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6631538059946400109L; + public static final long serialVersionUID = 8645639938564692796L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/EBase.java b/slice2java/js/test/typescript/Ice/objects/Test/EBase.java index a8dd144f46f6..a0cfb4cab586 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/EBase.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8696502299966546254L; + public static final long serialVersionUID = -7267409792712997618L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java b/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java index 89c77f8ee251..89498c5bd422 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5953072260500979922L; + public static final long serialVersionUID = 8118644352476420882L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java b/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java index 1ac9131d8f61..9cac9961f8d3 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225291580229241266L; + public static final long serialVersionUID = -6225288287295394456L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java index 5be171d54eaf..17f0e445619b 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 1211907383972894548L; + public static final long serialVersionUID = 4549051506987899540L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/F.java b/slice2java/js/test/typescript/Ice/objects/Test/F.java index 5a6a2c3cb508..2142ee13c48e 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/F.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7273422925160228399L; + public static final long serialVersionUID = 4522895196799763409L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/F1.java b/slice2java/js/test/typescript/Ice/objects/Test/F1.java index c17217c2b611..334033080572 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/F1.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192373980906669744L; + public static final long serialVersionUID = 6192372063002423442L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/F3.java b/slice2java/js/test/typescript/Ice/objects/Test/F3.java index 7f6d804d26a1..35d511367881 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/F3.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8527097094896493453L; + public static final long serialVersionUID = -2515439348548505275L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java index d0dc7eeb455d..0623da429211 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425259050691599886L; + public static final long serialVersionUID = -1425256881111075067L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java index 1d6387a37ab6..c488cd1448c3 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337224648583558802L; + public static final long serialVersionUID = -2337227936667767362L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java index d311887d8595..c8c87a733ba6 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298677284753946370L; + public static final long serialVersionUID = -1298680575337734144L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java index 019a07dbf0d7..475bf3902865 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842232236148564362L; + public static final long serialVersionUID = 1842234398211126874L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/K.java b/slice2java/js/test/typescript/Ice/objects/Test/K.java index fae4f53672ea..b9eecf576264 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/K.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645161166079656450L; + public static final long serialVersionUID = 4645163173095356101L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/L.java b/slice2java/js/test/typescript/Ice/objects/Test/L.java index d5f75acef03d..721d57c20737 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/L.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629737224435544604L; + public static final long serialVersionUID = 6629735054771657804L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/M.java b/slice2java/js/test/typescript/Ice/objects/Test/M.java index 556dd64ae179..23296eb04ca3 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/M.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088091049379062230L; + public static final long serialVersionUID = -8088093051398557595L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java b/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java index f7975e8d6ec4..578c8e7260e0 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617876930884970639L; + public static final long serialVersionUID = 3617878937895150512L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/objects/Test/S.java b/slice2java/js/test/typescript/Ice/objects/Test/S.java index ace416ff1314..0b19023936aa 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/S.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481768307626274863L; + public static final long serialVersionUID = 481770472276231679L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java b/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java index 297b5bff162c..c06e5839bb78 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227760859529707992L; + public static final long serialVersionUID = 6227757574192372478L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java index e5e0782815b7..2805852d6e4b 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -8265530082366189886L; + public static final long serialVersionUID = -8640972781077575166L; } diff --git a/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java b/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java index 3e8dcb7e935e..ff10dd3cb395 100644 --- a/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java +++ b/slice2java/js/test/typescript/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 7319067912256494175L; + public static final long serialVersionUID = -8197832744945301776L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java index 977acde1ed68..0183b3f3d80c 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/js/test/typescript/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723847634955698559L; + public static final long serialVersionUID = 2723847628581849589L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java b/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java index f6e72fa81ba1..55fa12cda223 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java +++ b/slice2java/js/test/typescript/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6794844551758057863L; + public static final long serialVersionUID = -2984126674129271827L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java b/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java index b5ebef352b49..cdbf1e63755f 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java +++ b/slice2java/js/test/typescript/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = -8070712857813913155L; + public static final long serialVersionUID = 6337895791624228221L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java index 9dabe52df181..2d086480e774 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java +++ b/slice2java/js/test/typescript/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = 4235069473320433486L; + public static final long serialVersionUID = -6856003342014610460L; } diff --git a/slice2java/js/test/typescript/Ice/operations/Test/Structure.java b/slice2java/js/test/typescript/Ice/operations/Test/Structure.java index 73713c2c2f17..f1fc3ca73761 100644 --- a/slice2java/js/test/typescript/Ice/operations/Test/Structure.java +++ b/slice2java/js/test/typescript/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = 5290958572000372749L; + public static final long serialVersionUID = 2942834943171078555L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/A.java b/slice2java/js/test/typescript/Ice/optional/Test/A.java index e8f61187036d..db26dbf05735 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/A.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 627702824372155920L; + public static final long serialVersionUID = -6846496359705648368L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/B.java b/slice2java/js/test/typescript/Ice/optional/Test/B.java index aefff6137a77..f83ab40778c3 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/B.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 775275502367351907L; + public static final long serialVersionUID = -6341548873555379229L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/C.java b/slice2java/js/test/typescript/Ice/optional/Test/C.java index aedb476a4767..6c4287b45201 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/C.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2396193252784345341L; + public static final long serialVersionUID = 6210401505060225533L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java index 9235c49c626a..1dbbd60c6d87 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359993199123774678L; + public static final long serialVersionUID = 4359993219939178839L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java b/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java index c959da378e47..bdf7abd13a88 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1101780523296333463L; + public static final long serialVersionUID = 1635079407859331814L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/E.java b/slice2java/js/test/typescript/Ice/optional/Test/E.java index 60fad911b212..4f00b449d571 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/E.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399095881502600273L; + public static final long serialVersionUID = 4399095695608245142L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/F.java b/slice2java/js/test/typescript/Ice/optional/Test/F.java index 83dc204cdd62..e1e07f794996 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/F.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111947723528478050L; + public static final long serialVersionUID = 2111947739105737509L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java index f91c013959f4..66140f16149d 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569601375288748903L; + public static final long serialVersionUID = 1569601354625417190L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/G.java b/slice2java/js/test/typescript/Ice/optional/Test/G.java index 26d7d79bb5e6..a460b77f478e 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/G.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4194335967133572179L; + public static final long serialVersionUID = -3476175991934626733L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/G1.java b/slice2java/js/test/typescript/Ice/optional/Test/G1.java index 99c0a05aab84..d57ea7d0b60b 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/G1.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356163702159715178L; + public static final long serialVersionUID = -356163684093677804L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/G2.java b/slice2java/js/test/typescript/Ice/optional/Test/G2.java index 8b899e7f53bc..d9804d060073 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/G2.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44031945784132378L; + public static final long serialVersionUID = 44031966606227355L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java index e6055a32df84..d2618aa8d83a 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3035140029100982293L; + public static final long serialVersionUID = 865978661853032642L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java b/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java index cd8674f94682..bca2b9bcce61 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219599217401795191L; + public static final long serialVersionUID = -7219599072909299320L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java b/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java index 8597f5172ce9..52540aef5d29 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1955552579815365493L; + public static final long serialVersionUID = -1853322749564401763L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java index d729274855c1..2145cdc869ce 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2883835944409376274L; + public static final long serialVersionUID = 596183537125626769L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java b/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java index 38afd0c062fa..b0a1d9a52297 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055419676371423406L; + public static final long serialVersionUID = 9055419730630796774L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java b/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java index 490db261870e..a0813c881bce 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 3342008607020970990L; + public static final long serialVersionUID = -4892129933852472095L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java index a34631f957f7..9eacfb8e045c 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700987901182837695L; + public static final long serialVersionUID = 6700987722801458513L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java b/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java index b9e17cebe1fe..643b4fe8c3ce 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912284255069794633L; + public static final long serialVersionUID = -1912284234423193163L; } diff --git a/slice2java/js/test/typescript/Ice/optional/Test/WD.java b/slice2java/js/test/typescript/Ice/optional/Test/WD.java index 2fe69ec0d24e..be008726e75d 100644 --- a/slice2java/js/test/typescript/Ice/optional/Test/WD.java +++ b/slice2java/js/test/typescript/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5038868355145012138L; + public static final long serialVersionUID = 9151974038141980789L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/C.java b/slice2java/js/test/typescript/Ice/scope/Test/C.java index d13c8b0d8f82..427f38275329 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/C.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190251336783472857L; + public static final long serialVersionUID = -5190247387623549649L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/C1.java b/slice2java/js/test/typescript/Ice/scope/Test/C1.java index 711d4658e15d..8f62a4dd71d1 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/C1.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893231623731904932L; + public static final long serialVersionUID = 8893233129742769165L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/C2.java b/slice2java/js/test/typescript/Ice/scope/Test/C2.java index eadc997f4eac..eebf2e08bac0 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/C2.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7815613375868753929L; + public static final long serialVersionUID = -8110352302092188616L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java index 1c549eb533e6..49e179d720b1 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615629879614982837L; + public static final long serialVersionUID = 4615622952360088478L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java index a9a094861e1f..79527814496b 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672584812765527840L; + public static final long serialVersionUID = 672588961192820295L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java index d8a2b2a7f9ff..20e1356d6626 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654440680210683854L; + public static final long serialVersionUID = 8654439339504979796L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java b/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java index 483cbdd79d0f..0b9952f1d527 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694612082189739778L; + public static final long serialVersionUID = 3694621486512050968L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/S.java b/slice2java/js/test/typescript/Ice/scope/Test/S.java index e610225a1b82..7da6ac4e1914 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/S.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159709615643187964L; + public static final long serialVersionUID = 2159697233200342374L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/S1.java b/slice2java/js/test/typescript/Ice/scope/Test/S1.java index 633e2894f9a8..9e2528da6368 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/S1.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241676156134367901L; + public static final long serialVersionUID = 1241674810417612852L; } diff --git a/slice2java/js/test/typescript/Ice/scope/Test/S2.java b/slice2java/js/test/typescript/Ice/scope/Test/S2.java index 4b023beebed9..d425396110e0 100644 --- a/slice2java/js/test/typescript/Ice/scope/Test/S2.java +++ b/slice2java/js/test/typescript/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 7976502470202844272L; + public static final long serialVersionUID = -5517784960912970815L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java index da001fe7767f..0c75ad0572b9 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023941590542876L; + public static final long serialVersionUID = -477024361380188867L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java index 95bc93433e12..edf7729a3bda 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435636592719814624L; + public static final long serialVersionUID = -8435642953272023303L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java index c58acd89cce3..c782105fd538 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485214609462422658L; + public static final long serialVersionUID = 3485213704227308635L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java index 7c2be6df5208..fee255cbfe95 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717378054351966195L; + public static final long serialVersionUID = 1717378639468625066L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java index c8ca80e81b42..d22103061b02 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384918375870646038L; + public static final long serialVersionUID = -7384919110807360077L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java index cfbefb5f2622..72a416d20beb 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733707233000978065L; + public static final long serialVersionUID = -2733696739751235786L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 9b980688c2c9..4d8d0b7fb4d3 100644 --- a/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528095938830944998L; + public static final long serialVersionUID = 4528106434528429247L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java index e0683bac18a8..7bb047a2ee9c 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2732987799997805837L; + public static final long serialVersionUID = 6234601668320604167L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java index 5f202ae162da..3bb958a945e5 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6241975933113143489L; + public static final long serialVersionUID = -9101484461062891061L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java index 05af55efc7d4..c878640dc72d 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6397004024286882362L; + public static final long serialVersionUID = -6397001814705921628L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java index 2469cc8a933d..d9b54ad9b8ff 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066882106769949480L; + public static final long serialVersionUID = -9066881423619499857L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java index 4a1a98e33635..4f512b2c9bea 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6009749972965725232L; + public static final long serialVersionUID = 7798216909579779780L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java index 8a4498ccf43f..45030ca23f8a 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6297737282861464206L; + public static final long serialVersionUID = -8413396470260174586L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java index 00685c930a2f..9ff61becf4a4 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1828987073810491579L; + public static final long serialVersionUID = 7282595463143484253L; } diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java index fabcf3e76eeb..196eb711cc50 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655917008412245001L; + public static final long serialVersionUID = -7655923311976640010L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java index 0838cff01a74..92bbd7891ae4 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271134851649527769L; + public static final long serialVersionUID = -2271128878495668631L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java index 834d52ff8538..8765b14e930b 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481706870202689538L; + public static final long serialVersionUID = 481709079895084126L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java index 20f1e8617743..dfb16b55b67b 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426894341274195322L; + public static final long serialVersionUID = -4426887006844876956L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java index 852142b21257..fe2a68b02d85 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850546051652836959L; + public static final long serialVersionUID = 850538557121432195L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java index 7a28341eea0a..0c1c3625dc89 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328903599615090261L; + public static final long serialVersionUID = -4328898667479598239L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java index 64fba5f61a66..f4afe1c50e56 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081816577557308705L; + public static final long serialVersionUID = -5081818617006869523L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java index a9422e7c7ad3..40efa2024326 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643076192334508767L; + public static final long serialVersionUID = 643079603356923624L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java index abeb3039b084..96058fe1c4f0 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438006814592002032L; + public static final long serialVersionUID = -2438007663216290219L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java index b4c0034acf84..85026faa9d65 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651522581790298390L; + public static final long serialVersionUID = 3651528554750754916L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java index eaf96ae60a18..af57d4e71e3b 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804372986320895795L; + public static final long serialVersionUID = 8804376397156239169L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java index ac654c352cb1..7e52b0dab8b7 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353755045217782203L; + public static final long serialVersionUID = -5353761348955315209L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java index b301c5bc68d3..91be9442ff01 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522130240223501931L; + public static final long serialVersionUID = -6522135012183394491L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java index 3f1ed95c7180..4f0e17a0951e 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620289248565720086L; + public static final long serialVersionUID = 7620287534799678150L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java index 92514b217fd8..21da08491307 100644 --- a/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/js/test/typescript/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -5117148682339411257L; + public static final long serialVersionUID = 2786726627700348447L; } diff --git a/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java b/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java index dd24e96dc15c..4fe5325e4097 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7979137530259227821L; + public static final long serialVersionUID = -8077788911089736304L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/stream/Test/MyException.java b/slice2java/js/test/typescript/Ice/stream/Test/MyException.java index 403296b43ce4..74f2f1230d11 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/MyException.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734224615005203999L; + public static final long serialVersionUID = 5734228768362864381L; } diff --git a/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java index 9cdb2613f83f..4f9c35c83d87 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1529486153341279059L; + public static final long serialVersionUID = -5638235870675970434L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java b/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java index d4c467245b39..54769d3f12e4 100644 --- a/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java +++ b/slice2java/js/test/typescript/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 1943611689756870637L; + public static final long serialVersionUID = -4921339580251253027L; } diff --git a/slice2java/js/test/typescript/Slice/macros/Test/Default.java b/slice2java/js/test/typescript/Slice/macros/Test/Default.java index a1f03e0eb304..6dc231a83030 100644 --- a/slice2java/js/test/typescript/Slice/macros/Test/Default.java +++ b/slice2java/js/test/typescript/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2139891837012817922L; + public static final long serialVersionUID = 5550418664503577054L; /** @hidden */ @Override diff --git a/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java b/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java index 22f58f03b863..810aff712262 100644 --- a/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java +++ b/slice2java/js/test/typescript/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8801173371895644447L; + public static final long serialVersionUID = -9052480610279810241L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index fc09b925d8a5..ddef72fcc06e 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5896747531193661980L; + public static final long serialVersionUID = 5052603034450672695L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java index d4fa311d8d3e..2c8576640101 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8010940371717926000L; + public static final long serialVersionUID = 6884005721121881923L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index cbf5e1a78d1a..bf1b953a30c6 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1596792558592998910L; + public static final long serialVersionUID = -6323352935571128126L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 3b0afcadcb66..341d675aa40d 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6053619972130909587L; + public static final long serialVersionUID = 6935506450188506396L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index 1dd85848f5ae..8bde357c08d0 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3948739973361851126L; + public static final long serialVersionUID = -655512363243216389L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java index 6cbf0033f8e9..600788046852 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5491235916758825919L; + public static final long serialVersionUID = 8402644536199662924L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 7209b8876f6b..051e0d6612b5 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3412677038954121626L; + public static final long serialVersionUID = -38009083442978266L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 93028c68b0b7..5ee8c53b9587 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4485899443083251805L; + public static final long serialVersionUID = 2478958201163734956L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index 9baac7cbf086..490bb5f49745 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127391788799920748L; + public static final long serialVersionUID = 5127391987467347131L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index 0b779735549c..d89fc6c28c59 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = 3060953552974208626L; + public static final long serialVersionUID = -4370936551106427796L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index e534e9ca71ad..81e85a41a618 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = -6180299000702093264L; + public static final long serialVersionUID = 8281656623088086539L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index 0953e598f99e..f6c9e88baaba 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = 5151064634754575982L; + public static final long serialVersionUID = -3985853726259748879L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index fcc15c9b5337..9e6727882fd2 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823745264086997999L; + public static final long serialVersionUID = 7823738007186151796L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 3766590cfe76..0c2aa75ee205 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/B.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861410634576815569L; + public static final long serialVersionUID = -3861417726017824460L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index 4a5a829bb03e..abfee90c0c93 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/C.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080698955289783279L; + public static final long serialVersionUID = 1080691698388937076L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index 4daebc81e7f5..647a29b4fd8f 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/D.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780381633525262639L; + public static final long serialVersionUID = 4780374542084253748L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index 6c0bcbab4e92..793fd62b6a00 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/E.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1876967942783969029L; + public static final long serialVersionUID = -1876980621143539267L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index fbb73a536f5c..8271a7410410 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/F.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 733475449132777784L; + public static final long serialVersionUID = 733476408518636670L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index 564c4fa463d9..3df71ec5b835 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641413601241813381L; + public static final long serialVersionUID = -4641409908951831072L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index 374c479c1184..5a1ff902a913 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8471300378431711842L; + public static final long serialVersionUID = -8471300397579655851L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index f324614cb46d..364a14917f41 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8898651917465621354L; + public static final long serialVersionUID = 8898651815506170046L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index 44ecdefba1ae..6891ca1c14e9 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4040525648183680992L; + public static final long serialVersionUID = 4040525998105227832L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index 45ef431aeeaa..d7f80d301105 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5383251174990621581L; + public static final long serialVersionUID = 5383251476138082732L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index a71d917609f8..8b16b27c2294 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4057364105975325523L; + public static final long serialVersionUID = 4057364246679893763L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index 44085881e0c0..2da727ba98b0 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1044055847316200396L; + public static final long serialVersionUID = -1044055662699667100L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index a5034cb0289f..194161f2dbf3 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1862551105499059617L; + public static final long serialVersionUID = -1862551003693376455L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index 1ec0f24824af..9fb714ddbafb 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2187164833368588999L; + public static final long serialVersionUID = -2187164609863987799L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index cd51c483c9fe..2c0184f691a7 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8116520992156532720L; + public static final long serialVersionUID = 5647064332164276556L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java b/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java index 5b20580611b9..613b0095fa29 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/Opt.java @@ -223,7 +223,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1832347016903273438L; + public static final long serialVersionUID = -5712237738491049730L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index cbab8083cc37..c721262cf15b 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = -5145825008788607609L; + public static final long serialVersionUID = -5145825193242460964L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index d7c6f39ee320..acb9423854c8 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 3347995356079653010L; + public static final long serialVersionUID = 3347995220389953606L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index 6145f1875996..0977f8f506dd 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - public static final long serialVersionUID = -9162150204827715334L; + public static final long serialVersionUID = -9162149816010831582L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index 6d4886e89914..197cfbfa4731 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S4 _nullMarshalValue = new S4(); /** @hidden */ - public static final long serialVersionUID = -2752860857318718927L; + public static final long serialVersionUID = -2752861075812227760L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index 29150e9f3b58..670d5af5e787 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S5 _nullMarshalValue = new S5(); /** @hidden */ - public static final long serialVersionUID = -6601217393945510967L; + public static final long serialVersionUID = -6601217292139083879L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index bc4ceba57e94..8e992f6d53ab 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S6 _nullMarshalValue = new S6(); /** @hidden */ - public static final long serialVersionUID = 3216394279978240460L; + public static final long serialVersionUID = 3216394333015030940L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index bc01bb35e5ee..603a4c375c38 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S7 _nullMarshalValue = new S7(); /** @hidden */ - public static final long serialVersionUID = -3218143310506941819L; + public static final long serialVersionUID = -3218143335112095261L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index 89c363e8c5cc..24c914957a27 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S8 _nullMarshalValue = new S8(); /** @hidden */ - public static final long serialVersionUID = 4560073160630317965L; + public static final long serialVersionUID = 4560073019779736477L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index d9724c7392b0..cbf0324150c7 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 3525902353905732211L; + public static final long serialVersionUID = 4483228024241185747L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index 248fc5cfc9dd..e2ff897b3bb2 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -597970249764985098L; + public static final long serialVersionUID = 7482120193467619885L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index 1cc113818151..5105821d85d5 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A1.java +++ b/slice2java/matlab/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926739279655311608L; + public static final long serialVersionUID = -5926737055752230416L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index 03dfa4bcb312..d47bd9facd0f 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890911776881899187L; + public static final long serialVersionUID = -8890913680561418466L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index f8cf0ff9a39e..12175166707e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B1.java +++ b/slice2java/matlab/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5212929288343934012L; + public static final long serialVersionUID = -4739147483232174076L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index 87da6eb7e1d8..5e3526f78d08 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Base.java +++ b/slice2java/matlab/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6804240084735396328L; + public static final long serialVersionUID = 2063150302188791002L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index 0ebc65cb14c0..7ae5d88d6f4c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/C.java +++ b/slice2java/matlab/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -36588728983485057L; + public static final long serialVersionUID = 4048903381948239808L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index fc8d9923b1c8..5072c5e74846 100644 --- a/slice2java/matlab/test/Ice/objects/Test/COneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050965007407038438L; + public static final long serialVersionUID = 3050967076483260114L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index 76a8754ddf32..29743c461365 100644 --- a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 167074134386898715L; + public static final long serialVersionUID = -6857220819057343717L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index 73f27b5701ca..036994dd6014 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D.java +++ b/slice2java/matlab/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3481703887126078463L; + public static final long serialVersionUID = 7373859100975484311L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index 19cbe45c5f13..ea8d6f1aa40e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9164581720271805949L; + public static final long serialVersionUID = 1126037504524240451L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index 8e456c09e486..1a044924bd28 100644 --- a/slice2java/matlab/test/Ice/objects/Test/E.java +++ b/slice2java/matlab/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6362645968146259685L; + public static final long serialVersionUID = 4847918040862078048L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index d512eb291caa..36f709a9bda3 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EBase.java +++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6050127007326251890L; + public static final long serialVersionUID = 167876757803560910L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index 4ea6cb55cdf0..85ecc16735fd 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java +++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3476083161899737966L; + public static final long serialVersionUID = -2335297546788991534L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index 57aae7a0f424..3dc2bccb2921 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225280024327833943L; + public static final long serialVersionUID = -6225277795402106659L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index a0c8bb9cfcce..0f9314896d1c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -4577098606891113580L; + public static final long serialVersionUID = 4403896995693635220L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index e579441ec926..4c3ba2930bec 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F.java +++ b/slice2java/matlab/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6578559089189911889L; + public static final long serialVersionUID = 1090390108393916625L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index 551fa60fc20f..337bc5571a88 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F1.java +++ b/slice2java/matlab/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192369071944697163L; + public static final long serialVersionUID = 6192371942817741144L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index 548c5f4abe6a..8e1ee9759734 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F3.java +++ b/slice2java/matlab/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3332206588091618813L; + public static final long serialVersionUID = -226056319364519033L; /** @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 edbfb87cf289..bdba7616b925 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425254233606440857L; + public static final long serialVersionUID = -1425250687125398092L; /** @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 54b15b409bfa..d673c001ba01 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337225289158856271L; + public static final long serialVersionUID = -2337227197934265271L; } 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 354cbaa5c628..94eda37b1c89 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298688838149544905L; + public static final long serialVersionUID = -1298691067209859133L; /** @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 917fbe9b7177..7285756a5b81 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842226135398901717L; + public static final long serialVersionUID = 1842229526798414829L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index 5853693ba500..19f33fc80d62 100644 --- a/slice2java/matlab/test/Ice/objects/Test/K.java +++ b/slice2java/matlab/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645160525589514176L; + public static final long serialVersionUID = 4645163591528031158L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index cb293a6d06de..e00b229d9d0a 100644 --- a/slice2java/matlab/test/Ice/objects/Test/L.java +++ b/slice2java/matlab/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629743317583302595L; + public static final long serialVersionUID = 6629740091510318971L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index 9f1b2299e115..bc6b0e44a574 100644 --- a/slice2java/matlab/test/Ice/objects/Test/M.java +++ b/slice2java/matlab/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088101314200248743L; + public static final long serialVersionUID = -8088104700429273967L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index f3924cb83bee..682c58631cf2 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Recursive.java +++ b/slice2java/matlab/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617887200706280221L; + public static final long serialVersionUID = 3617890586942641386L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index f63411146739..1fee99b1e435 100644 --- a/slice2java/matlab/test/Ice/objects/Test/S.java +++ b/slice2java/matlab/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481773119785140720L; + public static final long serialVersionUID = 481776831478406600L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index dbc631a82547..cb4a0bf61019 100644 --- a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227749311218262335L; + public static final long serialVersionUID = 6227747247607191627L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index 226edb871bc7..776adf4a19be 100644 --- a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -8994124854178934014L; + public static final long serialVersionUID = 515563791899593986L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index e121e0cc63bd..ef389cbc6d7a 100644 --- a/slice2java/matlab/test/Ice/objects/Test/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 5557432750825072425L; + public static final long serialVersionUID = -6924392503420788820L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index bdb500653c97..265b2f23b17f 100644 --- a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723847770477428361L; + public static final long serialVersionUID = 2723843499678449763L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index 861e1171e01b..0597e60866c1 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5125292340851030709L; + public static final long serialVersionUID = -916814350104069761L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index fa42a5bde9ed..575c00a09cad 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 2565584635581776733L; + public static final long serialVersionUID = -872163738042664483L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index 42e45114109b..8877cce36b63 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = -8221690800968288708L; + public static final long serialVersionUID = -1932239955606302090L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index ce6ff50f654f..96cd92b5e222 100644 --- a/slice2java/matlab/test/Ice/operations/Test/Structure.java +++ b/slice2java/matlab/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = 4465472423622031548L; + public static final long serialVersionUID = 7647365141299232185L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index c49621633951..f123ce2627ea 100644 --- a/slice2java/matlab/test/Ice/optional/Test/A.java +++ b/slice2java/matlab/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6805039441799876240L; + public static final long serialVersionUID = -7572374528650877168L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index 67793409229a..81671844fcc0 100644 --- a/slice2java/matlab/test/Ice/optional/Test/B.java +++ b/slice2java/matlab/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3069129267592421795L; + public static final long serialVersionUID = -7468840942343952797L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index f48eb050a5f3..43097e186f0b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/C.java +++ b/slice2java/matlab/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4672300582849420035L; + public static final long serialVersionUID = -6657841910348432195L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java index 9ed6a3f20bbc..427fce0ea16a 100644 --- a/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359996686248383475L; + public static final long serialVersionUID = 4360002997561172551L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/D.java b/slice2java/matlab/test/Ice/optional/Test/D.java index 32e2a08ced3b..26e18559377f 100644 --- a/slice2java/matlab/test/Ice/optional/Test/D.java +++ b/slice2java/matlab/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6408797697590095501L; + public static final long serialVersionUID = -4746740741470027159L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index 374ecaebccc5..0b935b5e2dfd 100644 --- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2405913214867456286L; + public static final long serialVersionUID = 6437554901136626910L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index 330257d43a75..fcb7e34094e3 100644 --- a/slice2java/matlab/test/Ice/optional/Test/E.java +++ b/slice2java/matlab/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399103139618969120L; + public static final long serialVersionUID = 4399096998773945172L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index 769872f2611d..bf42eec85c90 100644 --- a/slice2java/matlab/test/Ice/optional/Test/F.java +++ b/slice2java/matlab/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111951050416837267L; + public static final long serialVersionUID = 2111940820480348775L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index 107d3099025e..08e6539d17f8 100644 --- a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569603498471630658L; + public static final long serialVersionUID = 1569613733270939894L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index f5ef27ff49bc..474e245e245c 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G.java +++ b/slice2java/matlab/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -443851313520978221L; + public static final long serialVersionUID = 3592669800563648339L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index 611059b02184..6d8c9904636d 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G1.java +++ b/slice2java/matlab/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356162697400674573L; + public static final long serialVersionUID = -356162094214051961L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index 125b944cf046..b376a7503b9c 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G2.java +++ b/slice2java/matlab/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44035432906310604L; + public static final long serialVersionUID = 44041744228480312L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index 143ec4af1461..c1ee7317ec54 100644 --- a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5592882935140461714L; + public static final long serialVersionUID = 7098747390597968914L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 5b2c3d8c6309..a7aa8bc4156a 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219602704526682644L; + public static final long serialVersionUID = -7219608850379495144L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index 7bf2a2e9f701..fbd3366f0316 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7350598785430872720L; + public static final long serialVersionUID = -5027688869892259728L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index 4eb9db39e99d..8e8ebfbbfc29 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2435858697629750954L; + public static final long serialVersionUID = 2565237951339332574L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/Recursive.java b/slice2java/matlab/test/Ice/optional/Test/Recursive.java index 7c15bd470ffe..491aaab24d8f 100644 --- a/slice2java/matlab/test/Ice/optional/Test/Recursive.java +++ b/slice2java/matlab/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055420231714985810L; + public static final long serialVersionUID = 9055420829768219366L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index 8ceac67f7902..1402c8012679 100644 --- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -9014731181837967399L; + public static final long serialVersionUID = -8929048885717953959L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index e01c14aabc9a..906c67e716f1 100644 --- a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700981766560500221L; + public static final long serialVersionUID = 6700992079009144393L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 9b6c9c4be326..d4978ce67247 100644 --- a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912286057964418606L; + public static final long serialVersionUID = -1912285537583683290L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index 87882a47968b..4648763800fe 100644 --- a/slice2java/matlab/test/Ice/optional/Test/WD.java +++ b/slice2java/matlab/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7540170671499865718L; + public static final long serialVersionUID = 5372442187012456438L; /** @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 c5be0fb2a9a1..6340a6de340d 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477023019480169156L; + public static final long serialVersionUID = -477019688697678737L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index 6e76e6a86cc0..c31c14e4c3bd 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435630535737822728L; + public static final long serialVersionUID = -8435632339826950485L; /** @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 7c326ff21366..e27e6e48a28a 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485209590971649626L; + public static final long serialVersionUID = 3485213081592846729L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 008ba90d9a50..05acc80a1a45 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377132242305579L; + public static final long serialVersionUID = 1717373966937773688L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 5951fc5e2e40..43c41ea786bb 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384912479031121486L; + public static final long serialVersionUID = -7384914283138792479L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 3f1dcd33ad80..7150542a97d7 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733709118392977481L; + public static final long serialVersionUID = -2733711320443344156L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index d813435aafcd..e2fcd018b6b2 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528102155955387326L; + public static final long serialVersionUID = 4528100031572572397L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index 7f7ae6390c7d..20c4053c3b03 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137357514180830542L; + public static final long serialVersionUID = 6137354028634504061L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index d27b9e0ab028..93173f3093a2 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751745358373039982L; + public static final long serialVersionUID = 751741702206166045L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index 6d4307398e54..f5801ec90e90 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272737851632181306L; + public static final long serialVersionUID = -4272735964889036267L; /** @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 fb869607ee23..20f59c22d3b7 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1567966565394512580L; + public static final long serialVersionUID = -4313595760535643213L; /** @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 b8f7eebbf515..7a91b1552a8d 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4041366543572431984L; + public static final long serialVersionUID = -4444173592363483393L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index 94093888b8ee..cac3cf6fcc94 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6397002017238802587L; + public static final long serialVersionUID = -6397001291702049692L; /** @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 99f3383a004f..84881622c19d 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066881306176810980L; + public static final long serialVersionUID = -9066884509047467460L; /** @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 423b6ad7f42c..9dce9b857071 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6582843060983424223L; + public static final long serialVersionUID = 8294797803723645680L; /** @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 e4a2b0431098..635558bb7d2d 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5332560144933022435L; + public static final long serialVersionUID = -3620611017348471630L; /** @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 4289c8b1ae55..ae830112229b 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3391915192950624755L; + public static final long serialVersionUID = 5116787847681252805L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index ccb6e5fcaf93..3defa9fc54f2 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655923109144619599L; + public static final long serialVersionUID = -7655930320849881903L; /** @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 af30941d015d..31506e9edbfa 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271128750714047512L; + public static final long serialVersionUID = -2271121539055558771L; /** @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 4a7a7443c3b2..c4541d866294 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481708877203568413L; + public static final long serialVersionUID = 481709602804514002L; /** @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 52c28b79b587..5f1c973743cf 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426886879065553883L; + public static final long serialVersionUID = -4426881028680164828L; /** @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 fd80a708a7c5..aef19b1780f5 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850538759964880832L; + public static final long serialVersionUID = 850537863899511311L; /** @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 5de4e50c2674..73922628fd8b 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328898795254251808L; + public static final long serialVersionUID = -4328906001748641738L; /** @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 eeb607e90d19..efdb42e81a88 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081818734466229782L; + public static final long serialVersionUID = -5081802934489786629L; /** @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 683b4a0413f9..adc793fc15eb 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643079485607465627L; + public static final long serialVersionUID = 643089504924089467L; /** @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 5dc86559c8fd..5ba42d53622c 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438007780672913952L; + public static final long serialVersionUID = -2437998957305587406L; /** @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 999e1ea54bd3..4dde25d706c7 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651528682674982627L; + public static final long serialVersionUID = 3651535894242086002L; /** @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 07cd91829d8a..286a5dc4980a 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804376599847820102L; + public static final long serialVersionUID = 8804375708735407319L; /** @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 1f5a3247cac6..70b5b8526c68 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353761466414679824L; + public static final long serialVersionUID = -5353757767632363295L; /** @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 5ade715be397..87cfa564d49d 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522134894724025532L; + public static final long serialVersionUID = -6522143883143887179L; /** @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 6172d03ec58d..42a343a0b6d0 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620287406875454791L; + public static final long serialVersionUID = 7620281391118026998L; /** @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 6143dd116935..efaf44529217 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -6261669532242546528L; + public static final long serialVersionUID = -8708077596979586231L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index dd4ae0293221..15a035a99461 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7536758351576030803L; + public static final long serialVersionUID = 31805095751254637L; /** @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 23c05536f16b..45e1a9ae1c92 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java @@ -176,5 +176,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final bitor _nullMarshalValue = new bitor(); /** @hidden */ - public static final long serialVersionUID = -5854305394682761378L; + public static final long serialVersionUID = 5970810436719513599L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index 3e8d4fa61348..8a8c410c5759 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2421493944269065233L; + public static final long serialVersionUID = 2421494038493238988L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index 7c45ebf959e6..4f7acb65b64b 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6993676546741830085L; + public static final long serialVersionUID = -3878146231250278659L; /** @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 6c1d5e7d9560..20102f9573c6 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java @@ -110,5 +110,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2947766714525860689L; + public static final long serialVersionUID = 7609157990068884831L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index 861a74e3f96c..833fe2afd48e 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 400656460284669809L; + public static final long serialVersionUID = -7211763784447497128L; /** @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 124c798e69ac..837396b9b8dc 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1008943296702428112L; + public static final long serialVersionUID = -1008943199821863187L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index e110f2ea4d77..17171962e7fb 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8583448577593367645L; + public static final long serialVersionUID = -2715283057058073590L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java index 1d163bde3120..b42e8cf73d3c 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/php/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2185419506013202473L; + public static final long serialVersionUID = -1522477931456337346L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index b471f3c8942a..7811437ecb51 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3691788821592573318L; + public static final long serialVersionUID = 6708006729782141772L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index b6693f1be350..84dd0ebf47bb 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5295494007659831189L; + public static final long serialVersionUID = -7449755898911805769L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index 03c0e0728522..d07f5bc26dd0 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7388909616541136225L; + public static final long serialVersionUID = 7261009501339921177L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java index c15d47840e46..63a76c04cec3 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/php/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6352163201965403990L; + public static final long serialVersionUID = -3729937369019178706L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index a8eae7acb6a3..0a77ea5de0a2 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4736599484836748510L; + public static final long serialVersionUID = -7018770766375245656L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 44b084b684b6..f38a090ea576 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2019665455705696613L; + public static final long serialVersionUID = -7454263715303218617L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index 2dbbb3060efb..2ebdb1cee828 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127390344786762473L; + public static final long serialVersionUID = 5127393861421780882L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index ac24553f4c07..fc6802c1d0ab 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = -4728258059919342046L; + public static final long serialVersionUID = 4131906701032648083L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index bee18cad1c57..f20b265582be 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = 6317472503057247824L; + public static final long serialVersionUID = -791957688186037030L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index 16584358bfab..56cc3f71bd5a 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = -1326807087965649150L; + public static final long serialVersionUID = 3361391098214159241L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index d0c79659413c..ca6292f4ff0a 100644 --- a/slice2java/php/test/Ice/exceptions/Test/A.java +++ b/slice2java/php/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823744709909797690L; + public static final long serialVersionUID = 7823745533807015710L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index bab3e7aa9b69..c6c12fcbf436 100644 --- a/slice2java/php/test/Ice/exceptions/Test/B.java +++ b/slice2java/php/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861405733441656070L; + public static final long serialVersionUID = -3861410529861101858L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index e80b890dde44..0c78a5198c91 100644 --- a/slice2java/php/test/Ice/exceptions/Test/C.java +++ b/slice2java/php/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080698401112582970L; + public static final long serialVersionUID = 1080699225009800990L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index 6ae9107fa379..13f2784ef4b3 100644 --- a/slice2java/php/test/Ice/exceptions/Test/D.java +++ b/slice2java/php/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780386534660422138L; + public static final long serialVersionUID = 4780381738240976350L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index 48fcd128ba2f..dede77b0dd82 100644 --- a/slice2java/php/test/Ice/objects/Test/A.java +++ b/slice2java/php/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3632422420198631477L; + public static final long serialVersionUID = -6052042503491466477L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index 911f94e9f241..a0d8d3b43df6 100644 --- a/slice2java/php/test/Ice/objects/Test/A1.java +++ b/slice2java/php/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926741949038942262L; + public static final long serialVersionUID = -5926737197664109147L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index cfa14b50473f..50fa0a514484 100644 --- a/slice2java/php/test/Ice/objects/Test/B.java +++ b/slice2java/php/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890919935276080980L; + public static final long serialVersionUID = -8890913861519918901L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index c714f3f7cd4f..bea6cd7fe29d 100644 --- a/slice2java/php/test/Ice/objects/Test/B1.java +++ b/slice2java/php/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -775013043942667580L; + public static final long serialVersionUID = 8666458454954211588L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index 0dfaaf0b49c4..a95b080b6ee2 100644 --- a/slice2java/php/test/Ice/objects/Test/Base.java +++ b/slice2java/php/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2853958219594749991L; + public static final long serialVersionUID = 8021960468572118991L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index a202c46215ff..270816b76c82 100644 --- a/slice2java/php/test/Ice/objects/Test/C.java +++ b/slice2java/php/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5104894818904056318L; + public static final long serialVersionUID = -6816468166726435697L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index 92f50bbc106a..19549e141336 100644 --- a/slice2java/php/test/Ice/objects/Test/COneMember.java +++ b/slice2java/php/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050973335997251265L; + public static final long serialVersionUID = 3050967097018788398L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index 9a0faa1e1db7..a10dfab7b396 100644 --- a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2531859601776376283L; + public static final long serialVersionUID = -7250192799788130917L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index 9f56bcab8266..bca810ef8b61 100644 --- a/slice2java/php/test/Ice/objects/Test/D.java +++ b/slice2java/php/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7929712850186764675L; + public static final long serialVersionUID = 491111155934428188L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index 0c71713911b5..8603af41385b 100644 --- a/slice2java/php/test/Ice/objects/Test/D1.java +++ b/slice2java/php/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5694839349948329603L; + public static final long serialVersionUID = 4104910616013893059L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index c0ed62ad3a63..2cd5ec1a2750 100644 --- a/slice2java/php/test/Ice/objects/Test/E.java +++ b/slice2java/php/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5631944395667084828L; + public static final long serialVersionUID = -6716064200427736308L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index 644bb14dafd2..b087a205e9d5 100644 --- a/slice2java/php/test/Ice/objects/Test/EBase.java +++ b/slice2java/php/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8121452471210438286L; + public static final long serialVersionUID = 1763095153033373902L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index 436a8fb8f5e9..0393acaaac99 100644 --- a/slice2java/php/test/Ice/objects/Test/EDerived.java +++ b/slice2java/php/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -672333781850058734L; + public static final long serialVersionUID = -1495690779120212270L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index 946cd109beb6..43b869714c15 100644 --- a/slice2java/php/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225288479485285682L; + public static final long serialVersionUID = -6225277942537106463L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index 7854823845f9..ddc9c76e0dd3 100644 --- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 8000150903374012372L; + public static final long serialVersionUID = -6332467739824054764L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index eea0b45674b6..ad3a23cc70b6 100644 --- a/slice2java/php/test/Ice/objects/Test/F.java +++ b/slice2java/php/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8857519719793037679L; + public static final long serialVersionUID = -4174680629160352047L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index 486f2f3b433b..edb00b788914 100644 --- a/slice2java/php/test/Ice/objects/Test/F1.java +++ b/slice2java/php/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192376256311901280L; + public static final long serialVersionUID = 6192376010933168395L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index 807e18ea4ad8..4a23f097ddd0 100644 --- a/slice2java/php/test/Ice/objects/Test/F3.java +++ b/slice2java/php/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2326423464895461365L; + public static final long serialVersionUID = 2079548928439056717L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index 47455d060bba..6e7dd1f36058 100644 --- a/slice2java/php/test/Ice/objects/Test/K.java +++ b/slice2java/php/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645163355120648672L; + public static final long serialVersionUID = 4645163893655899915L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index fc20ceb72571..91effbb58b91 100644 --- a/slice2java/php/test/Ice/objects/Test/L.java +++ b/slice2java/php/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629735115389955713L; + public static final long serialVersionUID = 6629739952015913646L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index 2689f3a5eb4e..41a4878d66a6 100644 --- a/slice2java/php/test/Ice/objects/Test/Recursive.java +++ b/slice2java/php/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617879119926556736L; + public static final long serialVersionUID = 3617890568842024418L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index 75d0ec87d5da..1ec7021219b3 100644 --- a/slice2java/php/test/Ice/objects/Test/S.java +++ b/slice2java/php/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481770581970133810L; + public static final long serialVersionUID = 481776490367443101L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index d43d79b05df9..1b92e6fbc5f7 100644 --- a/slice2java/php/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227757347949298776L; + public static final long serialVersionUID = 6227747221611530487L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index 47ef035cdeae..623525b34f54 100644 --- a/slice2java/php/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -6950424042363693502L; + public static final long serialVersionUID = 7682644390064942210L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index 891189643bcb..6bf3285f80d8 100644 --- a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723845028778318707L; + public static final long serialVersionUID = 2723846207967483350L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index b9a3faad90a2..e86d4ddf0cd9 100644 --- a/slice2java/php/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/php/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4621865836339287361L; + public static final long serialVersionUID = 876458303066949767L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index fab519d058fa..602bb608b282 100644 --- a/slice2java/php/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/php/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = -3960506546579779530L; + public static final long serialVersionUID = -6817526144590912978L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index 6bfb91619a51..353e110126f4 100644 --- a/slice2java/php/test/Ice/operations/Test/Structure.java +++ b/slice2java/php/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = 3358246531848919000L; + public static final long serialVersionUID = -5409320815660829116L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index 2bdcfbb4ccca..934e3f884469 100644 --- a/slice2java/php/test/Ice/optional/Test/A.java +++ b/slice2java/php/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3286200291388292848L; + public static final long serialVersionUID = -7647753148259402992L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index e5eeac4fe399..8e67a3b92883 100644 --- a/slice2java/php/test/Ice/optional/Test/B.java +++ b/slice2java/php/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 524445318031370979L; + public static final long serialVersionUID = -3999516925031077597L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index 14a2fe7acf72..b7550b15741d 100644 --- a/slice2java/php/test/Ice/optional/Test/C.java +++ b/slice2java/php/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9157323461113917501L; + public static final long serialVersionUID = -5338551374713571459L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java index 357e07fe6e73..68c873eedf04 100644 --- a/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/php/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4359993161736616028L; + public static final long serialVersionUID = 4359992717484717739L; } diff --git a/slice2java/php/test/Ice/optional/Test/D.java b/slice2java/php/test/Ice/optional/Test/D.java index d76680c66dbc..f3542520f443 100644 --- a/slice2java/php/test/Ice/optional/Test/D.java +++ b/slice2java/php/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4147811877638483104L; + public static final long serialVersionUID = 1512825022413238199L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index 0a4f886677d7..c10e799cdd2b 100644 --- a/slice2java/php/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7881339175297899182L; + public static final long serialVersionUID = 3604161332580834450L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index 3cc01ec19f11..b31639f4a22c 100644 --- a/slice2java/php/test/Ice/optional/Test/E.java +++ b/slice2java/php/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399095758964578402L; + public static final long serialVersionUID = 4399101818293253397L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index fa6081f3f9f0..c112ff92f0fd 100644 --- a/slice2java/php/test/Ice/optional/Test/F.java +++ b/slice2java/php/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111947846066081745L; + public static final long serialVersionUID = 2111941466435211814L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index 11a2ce8fc984..cb2f2ac7d240 100644 --- a/slice2java/php/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/php/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569601252519947885L; + public static final long serialVersionUID = 1569602177217192602L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index 1b4b25608c75..b9da4b73f580 100644 --- a/slice2java/php/test/Ice/optional/Test/G.java +++ b/slice2java/php/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2370518039090143149L; + public static final long serialVersionUID = -3722798295245695405L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index e94372784c59..3be582e2b65a 100644 --- a/slice2java/php/test/Ice/optional/Test/G1.java +++ b/slice2java/php/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356163499331191735L; + public static final long serialVersionUID = -356169638967546626L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index b7781035c171..165ed2ad74d8 100644 --- a/slice2java/php/test/Ice/optional/Test/G2.java +++ b/slice2java/php/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44031908413030650L; + public static final long serialVersionUID = 44031464144740749L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index f621e64c1ec9..94f55b0882df 100644 --- a/slice2java/php/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/php/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2260008767263578958L; + public static final long serialVersionUID = 2413489970415472718L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index 7f835c93c077..322b302f215c 100644 --- a/slice2java/php/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/php/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219599014554938621L; + public static final long serialVersionUID = -7219598735762877772L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index 050aab231393..c4f2276fc9ea 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2613308781412863835L; + public static final long serialVersionUID = -4804067036417861083L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index 457ae39c30f4..c2e61955d4b7 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2171229824806141782L; + public static final long serialVersionUID = 2322743227061239837L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index c2cdbfdcc8e0..52642c8f0a17 100644 --- a/slice2java/php/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1054349585609294251L; + public static final long serialVersionUID = 4317166182627502869L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index f60a57c83291..5875ce8a3982 100644 --- a/slice2java/php/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/php/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700987698345191311L; + public static final long serialVersionUID = 6700988703117978296L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index d59ef73694fa..006646dfb433 100644 --- a/slice2java/php/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/php/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912284297774422552L; + public static final long serialVersionUID = -1912284736714485665L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index 0cc696f3b5d5..3135a41d62d7 100644 --- a/slice2java/php/test/Ice/optional/Test/WD.java +++ b/slice2java/php/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5190906840733139139L; + public static final long serialVersionUID = -2225610303741616093L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index ba71a977cf61..325674450461 100644 --- a/slice2java/php/test/Ice/scope/Test/C.java +++ b/slice2java/php/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190251137915584190L; + public static final long serialVersionUID = -5190247346154262522L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index 870152515040..51110013d32f 100644 --- a/slice2java/php/test/Ice/scope/Test/C1.java +++ b/slice2java/php/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893232112048608898L; + public static final long serialVersionUID = 8893233093562837669L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index 4923d97c48e1..7bb251e8ef9d 100644 --- a/slice2java/php/test/Ice/scope/Test/C2.java +++ b/slice2java/php/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8079749851038988543L; + public static final long serialVersionUID = -3708708904402764409L; /** @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 b6f64bc1da72..63b117bb6e58 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615629430360485103L; + public static final long serialVersionUID = 4615622993629088960L; /** @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 092377d057ce..26a726061929 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672584890477980338L; + public static final long serialVersionUID = 672588682018069605L; /** @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 f4d85a90ac55..7366bf2aed55 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654440522665066988L; + public static final long serialVersionUID = 8654439541144614457L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index 9e273a3acb40..74c59efd62f6 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694612120923392032L; + public static final long serialVersionUID = 3694621367838881013L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index 9024a5f0cd43..b0f18bc7169c 100644 --- a/slice2java/php/test/Ice/scope/Test/S.java +++ b/slice2java/php/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159709326369351710L; + public static final long serialVersionUID = 2159697434527320907L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index 2c1cc8362c5d..c39145bebd56 100644 --- a/slice2java/php/test/Ice/scope/Test/S1.java +++ b/slice2java/php/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241675672978948795L; + public static final long serialVersionUID = 1241674691451046556L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index 0723a59f5894..8680873dd2cb 100644 --- a/slice2java/php/test/Ice/scope/Test/S2.java +++ b/slice2java/php/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -3757127786376547834L; + public static final long serialVersionUID = -6875465681737785602L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index bddcb2ccd3ce..35461f6a04fa 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477021606611547319L; + public static final long serialVersionUID = -477021505882300731L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java index af1b4e70e965..c16f3a93f288 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435640043508268403L; + public static final long serialVersionUID = -8435640097769535487L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index 428593c514ef..9c428a3228ce 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485210988356738671L; + public static final long serialVersionUID = 3485210933943673699L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 5427e414e21c..1efdc4a6433f 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717375719392223006L; + public static final long serialVersionUID = 1717375784103700626L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 58e28cbcb7d0..7930adf0c5f4 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384921991985694777L; + public static final long serialVersionUID = -7384921880920088117L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 7e76b883c99f..c885ce124162 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733710520938112382L; + public static final long serialVersionUID = -2733710505426706162L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 547b50d2d4e6..dd40bace7e75 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528092653341478859L; + public static final long serialVersionUID = 4528092754066125511L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index d0fa36b32c43..e5165b057141 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5009388096426387829L; + public static final long serialVersionUID = -198904931744744740L; /** @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 6df9abc0b723..3ac03d9a3efc 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2576785314601499577L; + public static final long serialVersionUID = -8678984605814607856L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index 1058e20c9997..ec420b4f9614 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6396991586390898024L; + public static final long serialVersionUID = -6396991604203915407L; /** @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 40eabb10c625..972adcd1d0d1 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066881866699089901L; + public static final long serialVersionUID = -9066881423619464951L; /** @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 9b445a1936a4..313e466c8ea7 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7486249336255149160L; + public static final long serialVersionUID = -5719610290396461761L; /** @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 ccee2b1ee0ba..906ac3e31773 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5617922524244855180L; + public static final long serialVersionUID = 2656416496795519623L; /** @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 adf254d3ba40..0fa37803939e 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7481326449193583814L; + public static final long serialVersionUID = 7167351687031579410L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 38fd35016fea..ca8731435160 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655916768029847133L; + public static final long serialVersionUID = -7655923312044275824L; /** @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 ea5b2a72572e..6a9a1ddad0b6 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271135091720025795L; + public static final long serialVersionUID = -2271128878495587011L; /** @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 8c9bb8b508ef..2b74a18594b5 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481706960453316888L; + public static final long serialVersionUID = 481709079895141642L; /** @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 7bc49830ccb8..4f2bff8b6336 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426882233690554408L; + public static final long serialVersionUID = -4426882086499128399L; /** @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 11110475a402..e1d2e6428ae9 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850539234009666493L; + public static final long serialVersionUID = 850539091888817044L; /** @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 38ddc0c6f890..41a376cc8565 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328904796908050649L; + public static final long serialVersionUID = -4328904905215239083L; /** @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 7ad895688400..75791457f8a9 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081812484958403159L; + public static final long serialVersionUID = -5081812461723462443L; /** @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 ccd443450a31..de653b63636b 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643075952263632532L; + public static final long serialVersionUID = 643079603357167374L; /** @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 9efb6907886b..f3c85e5e3baf 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438007225278623486L; + public static final long serialVersionUID = -2438007663216318607L; /** @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 20cef25d791e..f329c84f3592 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651522341577259099L; + public static final long serialVersionUID = 3651528554750954847L; /** @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 085649ca4e75..9501f1bf70a0 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804373066391915006L; + public static final long serialVersionUID = 8804376397156232186L; /** @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 a51e618e62b6..1199307971a0 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353755125288782840L; + public static final long serialVersionUID = -5353761348955220084L; /** @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 1d2f379e0cce..745c1ca31aed 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522130330469702306L; + public static final long serialVersionUID = -6522135012169844519L; /** @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 94eff00e975e..42257589d168 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620289659096002141L; + public static final long serialVersionUID = 7620287534810858458L; /** @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 10f523f98bbc..0ee3880ba746 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -8197024298526185238L; + public static final long serialVersionUID = 4103446005261137965L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index af9c122def31..9bec935925a7 100644 --- a/slice2java/php/test/Slice/escape/Clash/Cls.java +++ b/slice2java/php/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3113141059383595266L; + public static final long serialVersionUID = -4093863845766431849L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index efce846363a0..a9d68a4dedb6 100644 --- a/slice2java/php/test/Slice/escape/Clash/Ex.java +++ b/slice2java/php/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 416845562919948882L; + public static final long serialVersionUID = 8256936919881139026L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index 594236dd889c..9bafa2b88ccf 100644 --- a/slice2java/php/test/Slice/escape/Clash/St.java +++ b/slice2java/php/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = 1170378823980338964L; + public static final long serialVersionUID = 6033195903321304001L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index 0f7a62b5dee8..0de555284d6b 100644 --- a/slice2java/php/test/Slice/escape/and/echo.java +++ b/slice2java/php/test/Slice/escape/and/echo.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -382944336307915006L; + public static final long serialVersionUID = -5168226249673768574L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index 6ff83b384a0b..6b84f6e011f2 100644 --- a/slice2java/php/test/Slice/escape/and/endif.java +++ b/slice2java/php/test/Slice/escape/and/endif.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3766559303246334655L; + public static final long serialVersionUID = -3766561452249035071L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index a8e83934e905..f59315cddc4e 100644 --- a/slice2java/php/test/Slice/escape/and/endwhile.java +++ b/slice2java/php/test/Slice/escape/and/endwhile.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6462003380098088686L; + public static final long serialVersionUID = 553232092694578670L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index c3b37a9ad58f..7d34bcde69e4 100644 --- a/slice2java/php/test/Slice/escape/and/xor.java +++ b/slice2java/php/test/Slice/escape/and/xor.java @@ -218,5 +218,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final xor _nullMarshalValue = new xor(); /** @hidden */ - public static final long serialVersionUID = -5107712644344463998L; + public static final long serialVersionUID = -3996957767792078718L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index 2b51efd12eb4..1fa90744fe03 100644 --- a/slice2java/php/test/Slice/macros/Test/Default.java +++ b/slice2java/php/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6212647374956955518L; + public static final long serialVersionUID = 2209398894053806590L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index cd69daa6095a..a0567367ab6a 100644 --- a/slice2java/php/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/php/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1078495644531015583L; + public static final long serialVersionUID = 3096353952439143199L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 1c24dc93cad6..f5f66bfa726d 100644 --- a/slice2java/php/test/Slice/structure/Test/C.java +++ b/slice2java/php/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3172281927040143671L; + public static final long serialVersionUID = -3172278056600099813L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index 8613073dbf97..c20e0e393ce2 100644 --- a/slice2java/php/test/Slice/structure/Test/S1.java +++ b/slice2java/php/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = -5542858132681438757L; + public static final long serialVersionUID = -5542860037691813598L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index 2e4767154547..09e709845a32 100644 --- a/slice2java/php/test/Slice/structure/Test/S2.java +++ b/slice2java/php/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -7596452231681158629L; + public static final long serialVersionUID = -7960628899645776036L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index edd64e93258f..a5a5624af98c 100644 --- a/slice2java/python/test/Ice/custom/Test/C.java +++ b/slice2java/python/test/Ice/custom/Test/C.java @@ -66,7 +66,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1117048717275944617L; + public static final long serialVersionUID = 1445895303207082455L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index 263032e103cd..008eddb557e0 100644 --- a/slice2java/python/test/Ice/custom/Test/D.java +++ b/slice2java/python/test/Ice/custom/Test/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 271241998875658893L; + public static final long serialVersionUID = -992424910190512118L; /** @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 ecab1c500110..4bd5aad92078 100644 --- a/slice2java/python/test/Ice/custom/Test/NumPy/D.java +++ b/slice2java/python/test/Ice/custom/Test/NumPy/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1539384116732978634L; + public static final long serialVersionUID = 5833513559772805936L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index 1ad11871dcd4..8c4a5c10588f 100644 --- a/slice2java/python/test/Ice/custom/Test/S.java +++ b/slice2java/python/test/Ice/custom/Test/S.java @@ -209,5 +209,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 6491319537442907246L; + public static final long serialVersionUID = -319414997674144146L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index 84c653f378f9..b43f1e04bfbd 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2151896524255916695L; + public static final long serialVersionUID = -730754102777017065L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index 4dd49f32bdcb..ab0368206c4a 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 608457562291005475L; + public static final long serialVersionUID = -7081551183185918685L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index 92d0a8676993..f10c38934505 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5459845665538885438L; + public static final long serialVersionUID = 6768626264211557442L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 1601b3cf9ca4..d960dd6f2f0f 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8875317065691318935L; + public static final long serialVersionUID = -3270852402862736031L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index 55da37d0e22b..42dae7899c1c 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4290890619467846075L; + public static final long serialVersionUID = 2398499406524043579L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index 04615e82e6dc..a0d7104abd72 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4143054331580233460L; + public static final long serialVersionUID = -2501960224862100596L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 1dc7606b0d17..4da86604a60c 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4577319605285681190L; + public static final long serialVersionUID = 6193841502468624678L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 1c282ef62448..8575cf9da121 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2146046745217316391L; + public static final long serialVersionUID = 4973087401058261009L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index 453ab79b286c..b7f493e45565 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127390245348141040L; + public static final long serialVersionUID = 5127395017366022662L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index 871f82853088..7c4ce0955e7c 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = -7144176720036994004L; + public static final long serialVersionUID = -764232331269706772L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index fbbe9b630bb7..eb7b2982bbb9 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = -1398339512101119317L; + public static final long serialVersionUID = -7269518045928418517L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index 08ff2553de5e..ba3ad89ec6b8 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = 4719384682606889550L; + public static final long serialVersionUID = -8650510983223737480L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index a4aaafde776c..48182f9d628b 100644 --- a/slice2java/python/test/Ice/exceptions/Test/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737281450032778L; + public static final long serialVersionUID = 7823741921701640492L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index 845f603acdf6..abc085da6710 100644 --- a/slice2java/python/test/Ice/exceptions/Test/B.java +++ b/slice2java/python/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418616910184758L; + public static final long serialVersionUID = -3861419597279115412L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index c71b7f5f81f1..51feffa20bc6 100644 --- a/slice2java/python/test/Ice/exceptions/Test/C.java +++ b/slice2java/python/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690972652818058L; + public static final long serialVersionUID = 1080695612904425772L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index 717107667852..5385b49a33f1 100644 --- a/slice2java/python/test/Ice/exceptions/Test/D.java +++ b/slice2java/python/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373651191893450L; + public static final long serialVersionUID = 4780372670822962796L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index aef0c3ed7e88..5070a706013d 100644 --- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641410993841450210L; + public static final long serialVersionUID = -4641407355795453512L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index 2c65c8968909..b785d3c7b891 100644 --- a/slice2java/python/test/Ice/objects/Test/A.java +++ b/slice2java/python/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4052037296333671110L; + public static final long serialVersionUID = -823887289475983050L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index d9a336ce1948..2b4072112b0d 100644 --- a/slice2java/python/test/Ice/objects/Test/A1.java +++ b/slice2java/python/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926751996666891965L; + public static final long serialVersionUID = -5926737014415615188L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index a2287d988d0d..e10b7b3666dd 100644 --- a/slice2java/python/test/Ice/objects/Test/B.java +++ b/slice2java/python/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890917915373797595L; + public static final long serialVersionUID = -8890913639330639127L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index b162e0f39123..f7ac0384d561 100644 --- a/slice2java/python/test/Ice/objects/Test/B1.java +++ b/slice2java/python/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7428990204907210364L; + public static final long serialVersionUID = 6571563493103575940L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index 7b145fedc3fb..08f5554f3a71 100644 --- a/slice2java/python/test/Ice/objects/Test/Base.java +++ b/slice2java/python/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8222647939326561922L; + public static final long serialVersionUID = 1023077444429488792L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index 2cc97700c2d5..7b5898ae9a7a 100644 --- a/slice2java/python/test/Ice/objects/Test/C.java +++ b/slice2java/python/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8433509327940841637L; + public static final long serialVersionUID = -7293600103890868197L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index 80e3d805565b..eebbb030c4b4 100644 --- a/slice2java/python/test/Ice/objects/Test/COneMember.java +++ b/slice2java/python/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050971184499491133L; + public static final long serialVersionUID = 3050973274087696585L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index d40302c01a3d..e84af14081a8 100644 --- a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5681150603729719451L; + public static final long serialVersionUID = -4639606555601870245L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index 07784cc1b44a..a235533db0a5 100644 --- a/slice2java/python/test/Ice/objects/Test/D.java +++ b/slice2java/python/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -723298016247185177L; + public static final long serialVersionUID = -7064139670023290277L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index b63225f770a4..14469154e807 100644 --- a/slice2java/python/test/Ice/objects/Test/D1.java +++ b/slice2java/python/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6664829208710750909L; + public static final long serialVersionUID = 1129884781974187587L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index 28d10d9c1ad9..a1c2a90f39b3 100644 --- a/slice2java/python/test/Ice/objects/Test/E.java +++ b/slice2java/python/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -242558832869242292L; + public static final long serialVersionUID = -7830012316624281627L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index c1f408923d1f..19c588dd39c9 100644 --- a/slice2java/python/test/Ice/objects/Test/EBase.java +++ b/slice2java/python/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -7204030530696598706L; + public static final long serialVersionUID = 5152017707145275726L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index 1db343a1038a..6abdbcd93c27 100644 --- a/slice2java/python/test/Ice/objects/Test/EDerived.java +++ b/slice2java/python/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1247678425387325394L; + public static final long serialVersionUID = -498673844437879086L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index 07d37bc400bc..f3a57dd7474c 100644 --- a/slice2java/python/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225293105611394190L; + public static final long serialVersionUID = -6225288291011837370L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index 385a0ef660af..cb46f330c762 100644 --- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 7924624343071726356L; + public static final long serialVersionUID = 3865022655777584980L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index 0aa93aeae818..ece8d3d60635 100644 --- a/slice2java/python/test/Ice/objects/Test/F.java +++ b/slice2java/python/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3548883449514489519L; + public static final long serialVersionUID = 5673994470835280593L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index 3686f3d3d872..97b776789afa 100644 --- a/slice2java/python/test/Ice/objects/Test/F1.java +++ b/slice2java/python/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192373551982365692L; + public static final long serialVersionUID = 6192376115616617671L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index 187bde9456c8..e723b0b5f709 100644 --- a/slice2java/python/test/Ice/objects/Test/F3.java +++ b/slice2java/python/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2914985920098411707L; + public static final long serialVersionUID = 2031523195088144183L; /** @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 0265c450500e..9c2395c1c0d7 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425265666936901041L; + public static final long serialVersionUID = -1425250645903535613L; /** @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 4c85386d5b9e..5ca9207052d9 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337233912349903622L; + public static final long serialVersionUID = -2337226908502873323L; } 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 16f61aca1b0d..11787746d526 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298684226391448026L; + public static final long serialVersionUID = -1298691020890805887L; /** @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 ee5cb25656d1..2e866e88fd97 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842233557396557214L; + public static final long serialVersionUID = 1842229490475868977L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index 9218e043235d..adc71d7b0f99 100644 --- a/slice2java/python/test/Ice/objects/Test/K.java +++ b/slice2java/python/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645167787429787265L; + public static final long serialVersionUID = 4645163875648221472L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index 1f2b2c9a4c40..a5caaa20ac4b 100644 --- a/slice2java/python/test/Ice/objects/Test/L.java +++ b/slice2java/python/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629744160999767944L; + public static final long serialVersionUID = 6629740050013082407L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index 305ecdd21385..7e150683bb62 100644 --- a/slice2java/python/test/Ice/objects/Test/M.java +++ b/slice2java/python/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088097986018010709L; + public static final long serialVersionUID = -8088104989570896004L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index a48c44095b5d..6002f4b04d5e 100644 --- a/slice2java/python/test/Ice/objects/Test/Recursive.java +++ b/slice2java/python/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617883872519728770L; + public static final long serialVersionUID = 3617890871072150152L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index c198a8ca1dca..f173d472e913 100644 --- a/slice2java/python/test/Ice/objects/Test/S.java +++ b/slice2java/python/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481772596681336123L; + public static final long serialVersionUID = 481776877952609172L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 2524d61bc1f2..6c59c8aa90b5 100644 --- a/slice2java/python/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227754039277158116L; + public static final long serialVersionUID = 6227757570318699728L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 42805f3a2c2d..9221b6f43dde 100644 --- a/slice2java/python/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = -7952549493024702590L; + public static final long serialVersionUID = -4207146108377574462L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index 0ba0b863af58..03c3edeaff20 100644 --- a/slice2java/python/test/Ice/objects/Test/StructKey.java +++ b/slice2java/python/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 277319455812235136L; + public static final long serialVersionUID = 7900563250086997289L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index 7ab2ebea6b4c..7f4e84437181 100644 --- a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723847771840817165L; + public static final long serialVersionUID = 2723851106425170956L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index e5c8b54daa56..a46fab6c1120 100644 --- a/slice2java/python/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/python/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8161618880189507409L; + public static final long serialVersionUID = 166010665585731515L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index afec42ec5379..11974ffa22a3 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = -2985911508957781347L; + public static final long serialVersionUID = -1281409836159629379L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index ddbaaf7db6dc..fd20a975538a 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = 767560748255119000L; + public static final long serialVersionUID = 213669039607650130L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index a444a8bc6aa0..8c2d1489263f 100644 --- a/slice2java/python/test/Ice/operations/Test/Structure.java +++ b/slice2java/python/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = -5033909497881733737L; + public static final long serialVersionUID = 2655641453091826682L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index 028a3b4c8417..4b8a3da7fd2a 100644 --- a/slice2java/python/test/Ice/optional/Test/A.java +++ b/slice2java/python/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6257119682817293424L; + public static final long serialVersionUID = -4784030209854764912L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index 650b39d1688e..2862a9ff49b9 100644 --- a/slice2java/python/test/Ice/optional/Test/B.java +++ b/slice2java/python/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4875671814335707933L; + public static final long serialVersionUID = 3575682247240908451L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index 7cda3c7374c2..d9cd43d2b1ff 100644 --- a/slice2java/python/test/Ice/optional/Test/C.java +++ b/slice2java/python/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2864542875569963523L; + public static final long serialVersionUID = 7816500072763148285L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java index eef3174c8d9e..bfe4be4691a7 100644 --- a/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/python/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4360001642903699830L; + public static final long serialVersionUID = 4360001580916574399L; } diff --git a/slice2java/python/test/Ice/optional/Test/D.java b/slice2java/python/test/Ice/optional/Test/D.java index a7954d5c133d..afddf13967b1 100644 --- a/slice2java/python/test/Ice/optional/Test/D.java +++ b/slice2java/python/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3659373860674402823L; + public static final long serialVersionUID = -2624002090242377463L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index bde203176a23..900ea9b1af58 100644 --- a/slice2java/python/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -190447844240506421L; + public static final long serialVersionUID = 4321410833220162258L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index 2d86db6c56a7..dcdaffb564c2 100644 --- a/slice2java/python/test/Ice/optional/Test/E.java +++ b/slice2java/python/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399092887947434736L; + public static final long serialVersionUID = 4399092950024647306L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index 0b9f8fa3ebdb..798fec1d98f4 100644 --- a/slice2java/python/test/Ice/optional/Test/F.java +++ b/slice2java/python/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111939316142128195L; + public static final long serialVersionUID = 2111939419396672057L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index 22c97bf9101b..f2654f92a86e 100644 --- a/slice2java/python/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/python/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569609777592375367L; + public static final long serialVersionUID = 1569609674277196814L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index 195cce9be075..f3d6bcdc2823 100644 --- a/slice2java/python/test/Ice/optional/Test/G.java +++ b/slice2java/python/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5317597557495431085L; + public static final long serialVersionUID = 8712457300778516947L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index c6b837ab89d1..dd28d05d64fe 100644 --- a/slice2java/python/test/Ice/optional/Test/G1.java +++ b/slice2java/python/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356160876427860061L; + public static final long serialVersionUID = -356160687791348542L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index 0ae9832b4164..f050b3e1489f 100644 --- a/slice2java/python/test/Ice/optional/Test/G2.java +++ b/slice2java/python/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44040389556965899L; + public static final long serialVersionUID = 44040327657231957L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index 91fa86659ecb..169e904edd9f 100644 --- a/slice2java/python/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/python/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8991258138061828087L; + public static final long serialVersionUID = -147972223327728345L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index a165731fc372..eecb2a56ad2d 100644 --- a/slice2java/python/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/python/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219607495874098967L; + public static final long serialVersionUID = -7219607433734897120L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index 572c2495a0c7..b347fe20cd68 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8850591322004728759L; + public static final long serialVersionUID = 278958790446051834L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index 49e6abfce790..92eb198c6db2 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3935790738598186013L; + public static final long serialVersionUID = -9136571455321229003L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/Recursive.java b/slice2java/python/test/Ice/optional/Test/Recursive.java index 2f9e9dcc9924..bdc1d6c3cbf3 100644 --- a/slice2java/python/test/Ice/optional/Test/Recursive.java +++ b/slice2java/python/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055416922970806256L; + public static final long serialVersionUID = 9055416780970712112L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index 569d4b20d47e..5ba6b3a84159 100644 --- a/slice2java/python/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -5232361395282632244L; + public static final long serialVersionUID = -3787389722114333227L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index 2506c93351c5..a0ad04f289f8 100644 --- a/slice2java/python/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/python/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700996145775248944L; + public static final long serialVersionUID = 6700996122509829627L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index 7bd913c9f9d7..d2da24f938e7 100644 --- a/slice2java/python/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/python/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912281426754933886L; + public static final long serialVersionUID = -1912281488815145629L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index 4bb58d43bfa7..b8583df1344f 100644 --- a/slice2java/python/test/Ice/optional/Test/WD.java +++ b/slice2java/python/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4323588241380389443L; + public static final long serialVersionUID = 4061213598807099595L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index 16c176f09431..5564f24dc207 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1894608979804646758L; + public static final long serialVersionUID = 1894608895949823327L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index 2adbcf3cb73a..bf3b3949c2f1 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2892574831203685898L; + public static final long serialVersionUID = 2892574594836682521L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 5e6e933a97a2..894792a4e145 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5787332459616089769L; + public static final long serialVersionUID = 5787332543476661200L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index 9fc15065acbd..0a8d0185be17 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4908753225577218384L; + public static final long serialVersionUID = 4908753149240844867L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index 5c9d0479d608..7f65f9b6e35b 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/def.java +++ b/slice2java/python/test/Ice/packagemd/Test1/def.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7298390383989426746L; + public static final long serialVersionUID = 7298390620403704195L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index a9e98830c58c..0249579d45cd 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -860911303892394743L; + public static final long serialVersionUID = -860918827984917045L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 7a2f45bb4588..8de960a69e89 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954150844183493706L; + public static final long serialVersionUID = 954150097867084168L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index ec57e24dc5ba..968570d0ba8c 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6934993438099185702L; + public static final long serialVersionUID = 6934988564098927076L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index 51d6ced56154..ba0990624cc7 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5414535604539366227L; + public static final long serialVersionUID = 5414536180686156945L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index 56753524f4b1..1ad045395a8e 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5832349211983138632L; + public static final long serialVersionUID = 5832349787977996426L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index 297e0e7a81d6..71a8c2899811 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2769373394032260778L; + public static final long serialVersionUID = 2769372812719876968L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index bc4195dd0948..2eefc17a2d73 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5344588261992587015L; + public static final long serialVersionUID = 5344586198226628933L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index 36dabc50b7cd..14b402fe3a8f 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8399043593608510862L; + public static final long serialVersionUID = -8399051117548821712L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index bbefefcb1ee8..193d6cd9005b 100644 --- a/slice2java/python/test/Ice/scope/Test/C.java +++ b/slice2java/python/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190251518951416120L; + public static final long serialVersionUID = -5190248871442079670L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index 76986d920f46..c2ce611ade85 100644 --- a/slice2java/python/test/Ice/scope/Test/C1.java +++ b/slice2java/python/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893231645767785854L; + public static final long serialVersionUID = 8893234293277117948L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 1785847ec3c1..d3b206285999 100644 --- a/slice2java/python/test/Ice/scope/Test/C2.java +++ b/slice2java/python/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7429511053557684301L; + public static final long serialVersionUID = -3028300469604292657L; /** @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 ada8ce25820e..645989d4faed 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615629896426296952L; + public static final long serialVersionUID = 4615627248917104250L; /** @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 19bd51eaea7d..ebe417d9b5a4 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672584674650703845L; + public static final long serialVersionUID = 672592937467513191L; /** @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 8dad2fb3d0a4..94eaa9fe9e15 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654440823480108128L; + public static final long serialVersionUID = 8654438175970776034L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index c95825788b9c..87d50001e89c 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694611739881006508L; + public static final long serialVersionUID = 3694620002693076526L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index f1b18dac5230..55e62c184dc6 100644 --- a/slice2java/python/test/Ice/scope/Test/S.java +++ b/slice2java/python/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159709792643951378L; + public static final long serialVersionUID = 2159701529831881360L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index f20523407dec..ae0c5e367331 100644 --- a/slice2java/python/test/Ice/scope/Test/S1.java +++ b/slice2java/python/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241676139255298631L; + public static final long serialVersionUID = 1241678786764630725L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index d73ce1136b1b..201329a96bfe 100644 --- a/slice2java/python/test/Ice/scope/Test/S2.java +++ b/slice2java/python/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 7482505982932872116L; + public static final long serialVersionUID = -2975305540229104842L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index dee65b9e4176..2b15343a8c27 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477021093821265453L; + public static final long serialVersionUID = -477024201244544504L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java index f67ff65250f9..b506454a7ed4 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435644655276547945L; + public static final long serialVersionUID = -8435636852369364148L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index ba4cf47e0bd2..df1a5ab5e3e2 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485211676459637621L; + public static final long serialVersionUID = 3485214184661366574L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 1227063f3559..583d991c74f3 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717375372042665348L; + public static final long serialVersionUID = 1717377632130707551L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 2c621699718f..aa1ddd9a9c00 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384921143408854563L; + public static final long serialVersionUID = -7384918113786550010L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 0b2d55b5ad3f..8dcc5d57b13e 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733699004987720168L; + public static final long serialVersionUID = -2733706973354773821L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index a0621b8b7e95..b98b18a19e11 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528104081614147281L; + public static final long serialVersionUID = 4528095519030310922L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java index 194a89ef3a79..4107e4b2b0fd 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137369747023380844L; + public static final long serialVersionUID = 6137366196695278763L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java index 643033d2f8ae..85c96d2360c9 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751746680742673164L; + public static final long serialVersionUID = 751748745873559115L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java index 28c86129609b..91bf06b3adec 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272722808616002043L; + public static final long serialVersionUID = -4272726191067625278L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java index e96130e08568..5a78d010dc80 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612523849284842458L; + public static final long serialVersionUID = 6612524009433316287L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java index c6a98c6f0fcf..ba30668c445d 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036461359865534394L; + public static final long serialVersionUID = 3036461520023347615L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java index 9dd82dc4d507..df73e280fa49 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691109034936551367L; + public static final long serialVersionUID = 691104748328850853L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 898330364d04..4992672db481 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424380423537006686L; + public static final long serialVersionUID = 3424368174055852028L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 743eaf56d388..02ddbe0ababc 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172597826042053361L; + public static final long serialVersionUID = -1172601926674619923L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index e9973e83cf92..3b0ef4723f8f 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126109118200641802L; + public static final long serialVersionUID = -1126115928031796716L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 307f66db2326..b7d691c89b01 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097573293217773482L; + public static final long serialVersionUID = -2097585563361840652L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index f50d2936e046..0eea59f5bb08 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8461120936974013288L; + public static final long serialVersionUID = 6827294226877891883L; /** @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 0b0cfc815305..480ebc54fa35 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 2801731419980705060L; + public static final long serialVersionUID = -1552102848385272601L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index 3ed5e2f5e1af..4907c897ac31 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6397005868512588600L; + public static final long serialVersionUID = -6397004043627992813L; /** @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 0ed84c40824d..8b64f1e16c72 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066882057893768564L; + public static final long serialVersionUID = -9066888059280365574L; /** @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 575adfe5c741..d852ff567855 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8742599704731089045L; + public static final long serialVersionUID = 5802445973562396872L; /** @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 4f9c89226665..3386055f060c 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -312601030929309856L; + public static final long serialVersionUID = 5258251943907484029L; /** @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 f590d40746ed..b2ec517a494f 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3191988779105287344L; + public static final long serialVersionUID = -7997029176855057145L; /** @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 9ae1bd1138ae..eed8455d5db3 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8022136700047202893L; + public static final long serialVersionUID = 1341404820848505331L; /** @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 69eb60a8ef61..80ce2ab3df3b 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5406310295269355761L; + public static final long serialVersionUID = 3372138568104096305L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index e3243373bd14..82a51b9c6b77 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655923581940994604L; + public static final long serialVersionUID = -7655927298886956860L; /** @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 d4265b5c3ce8..c265f36e0437 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271134962610098021L; + public static final long serialVersionUID = -2271124768984165799L; /** @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 22784b50f5a8..65b593904335 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4147524460856989011L; + public static final long serialVersionUID = 4147532723673887084L; /** @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 3f3de5e669b3..271ef2fa6a79 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481706963250544207L; + public static final long serialVersionUID = 481712985295303566L; /** @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 2f7df34ac6e0..00b7ddc3e73e 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426890895647100536L; + public static final long serialVersionUID = -4426894525923484333L; /** @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 2510c62170a1..dc6910449496 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850542962403948286L; + public static final long serialVersionUID = 850546070986240807L; /** @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 b041fa32e7a3..4810740c4dcb 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328899590760356763L; + public static final long serialVersionUID = -4328903381278410873L; /** @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 91be204541ee..b3cad774bf40 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081815048610996577L; + public static final long serialVersionUID = -5081816713397014345L; /** @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 7cd5b6363942..dd7c278e81e9 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643076083950037899L; + public static final long serialVersionUID = 643086277574485693L; /** @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 8d1a5fd67e3a..266945f10e27 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2438007178909788462L; + public static final long serialVersionUID = -2438001027555403254L; /** @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 b100ce32c69f..1f699d52abf7 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1367815990294765183L; + public static final long serialVersionUID = -7926637369164479333L; /** @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 d98dfad19c89..d65654040c5f 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8813708464530493033L; + public static final long serialVersionUID = -8813705497882481653L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java index f78aca8cd1cc..e8afb8d8f4e3 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410703552270667284L; + public static final long serialVersionUID = 4410695288398464094L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java index ee39e51c446f..e11482249906 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651522295075174544L; + public static final long serialVersionUID = 3651532706904217039L; /** @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 bf26b6266a0d..6c6999424542 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804373102704985141L; + public static final long serialVersionUID = 8804372283918813930L; /** @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 8a27c3d3de24..2d8f67d64d97 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4989057392236677341L; + public static final long serialVersionUID = -4989065655057426495L; /** @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 c2849d4185ca..969d6c7c8d34 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353755409582191037L; + public static final long serialVersionUID = -5353754425469143908L; /** @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 a8e596e227fb..a9b3641313f9 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522130335847188659L; + public static final long serialVersionUID = -6522141774155927467L; /** @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 313755eeeb18..ed0d42a65b87 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620289315666860238L; + public static final long serialVersionUID = 7620283260035540054L; /** @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 a4d8aa565dd5..c3427166c0b6 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = -2879284096575917797L; + public static final long serialVersionUID = 8585467688665192775L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index c05552a6ccbf..d013a25de3cb 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5294282310574929494L; + public static final long serialVersionUID = -2303954256630153720L; /** @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 1f0ed37d2586..ed96116c7067 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 282997216779818684L; + public static final long serialVersionUID = -1620815606184945172L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index dd881381606c..93a453747833 100644 --- a/slice2java/python/test/Slice/escape/Clash/Cls.java +++ b/slice2java/python/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3094265440385968056L; + public static final long serialVersionUID = 1109263654630086952L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index de764cde9f2e..970fcf02ed7d 100644 --- a/slice2java/python/test/Slice/escape/Clash/Ex.java +++ b/slice2java/python/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1097550502663219959L; + public static final long serialVersionUID = 1277992225533080841L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index a7fbbcf85dc8..4be25d4777db 100644 --- a/slice2java/python/test/Slice/escape/Clash/St.java +++ b/slice2java/python/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = 5528536472753974640L; + public static final long serialVersionUID = -1740401574542529952L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index ffa97547011b..c8a1ae1c3ea1 100644 --- a/slice2java/python/test/Slice/escape/and/_continue.java +++ b/slice2java/python/test/Slice/escape/and/_continue.java @@ -138,5 +138,5 @@ static public java.util.Optional<_continue> ice_read(com.zeroc.Ice.InputStream i private static final _continue _nullMarshalValue = new _continue(); /** @hidden */ - public static final long serialVersionUID = 1201382570936151532L; + public static final long serialVersionUID = 1201372474387880731L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index beba1fa7e881..520937e813dc 100644 --- a/slice2java/python/test/Slice/escape/and/_for.java +++ b/slice2java/python/test/Slice/escape/and/_for.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3227339729969483790L; + public static final long serialVersionUID = -2931820208813543111L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index 8eadfd53b6cc..b8f7693ce645 100644 --- a/slice2java/python/test/Slice/escape/and/is.java +++ b/slice2java/python/test/Slice/escape/and/is.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4585936082737269609L; + public static final long serialVersionUID = -4585942671955715872L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index aea606e5dd97..8e539acc0c26 100644 --- a/slice2java/python/test/Slice/escape/and/not.java +++ b/slice2java/python/test/Slice/escape/and/not.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3402198789119776121L; + public static final long serialVersionUID = 496678274174103161L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index e104502c5db4..e2983d794712 100644 --- a/slice2java/python/test/Slice/macros/Test/Default.java +++ b/slice2java/python/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1302556009701426146L; + public static final long serialVersionUID = 407624434711016574L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index 0fe2ea2d9f2c..2f53d76a52cd 100644 --- a/slice2java/python/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/python/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7068900648758791169L; + public static final long serialVersionUID = 4779863602015901343L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index 6e2cf850f1aa..c2bceaf859ef 100644 --- a/slice2java/python/test/Slice/structure/Test/C.java +++ b/slice2java/python/test/Slice/structure/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1667150857012193008L; + public static final long serialVersionUID = 1667160443500732275L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index 2d84cffd3b6f..db6b734b40f7 100644 --- a/slice2java/python/test/Slice/structure/Test/S1.java +++ b/slice2java/python/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = -5542861877962013608L; + public static final long serialVersionUID = -5542857751638909989L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index 38d911df8ea6..dc62bf81b541 100644 --- a/slice2java/python/test/Slice/structure/Test/S2.java +++ b/slice2java/python/test/Slice/structure/Test/S2.java @@ -217,5 +217,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -9208429950947832762L; + public static final long serialVersionUID = 138016745901568550L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index d874d13382fc..f94050202b50 100644 --- a/slice2java/python/test/Slice/structure/Test/S3.java +++ b/slice2java/python/test/Slice/structure/Test/S3.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - public static final long serialVersionUID = -6171300123125994338L; + public static final long serialVersionUID = 4926204744694256605L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index caee447009d1..f1715c895a3b 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2673448227675455964L; + public static final long serialVersionUID = -5880817570546271231L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java index e06d3d036371..2b319779d3c6 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8663252268530603368L; + public static final long serialVersionUID = -3790045926094305483L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index 59cac3123dd6..4e60d396c3ef 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7826269419789197919L; + public static final long serialVersionUID = 6436283705622525087L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 0932819824c4..1ac2a3604b24 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8182490773493703936L; + public static final long serialVersionUID = -878371020154543821L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index 2d549b46aaf9..b530a5fd7736 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3866199531125641410L; + public static final long serialVersionUID = -3858096599178501639L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java index 10871ed0fb1d..ecc9e1d8b872 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8279791260785649161L; + public static final long serialVersionUID = 702215891772192206L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index afdca29834c9..fac563f787dc 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3946539981705112389L; + public static final long serialVersionUID = -2113777855860193029L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 2e9c70117675..70991c07092a 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8695804215155792560L; + public static final long serialVersionUID = -2337372517691599293L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index 04cc542d1750..0849e64389c8 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - public static final long serialVersionUID = 5127391486377661332L; + public static final long serialVersionUID = 5127388699352778914L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index e5246584aaf7..24085405b304 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = 8925235441007492450L; + public static final long serialVersionUID = -6905808023615670984L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index 7892b3fd326b..ac6aefd18d96 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = -7577677306730144417L; + public static final long serialVersionUID = -8954284278078180993L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index d164b7e68839..79e1b18812db 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - public static final long serialVersionUID = -2390143017885614818L; + public static final long serialVersionUID = 640381688320410453L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index 2157de00c6c8..8eac8e873b63 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737984003768022L; + public static final long serialVersionUID = 7823744644125184108L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index 4b3ca3c86eb5..eb6a59c028f6 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/B.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861417914659906154L; + public static final long serialVersionUID = -3861405633918091092L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index 7d52c7a825aa..7237fd54aff9 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/C.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080691675206553302L; + public static final long serialVersionUID = 1080698335327969388L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index d27f1e38b331..e558555a6e01 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/D.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780374353442172054L; + public static final long serialVersionUID = 4780386634183987116L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index a174b288c8bd..037ed5f6fccc 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641409971003674046L; + public static final long serialVersionUID = -4641415863995776776L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index 546116d551f9..81284be06397 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A.java +++ b/slice2java/ruby/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1929008928962766522L; + public static final long serialVersionUID = 6537680134059735251L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index 68044269ab7c..97c9e561253c 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A1.java +++ b/slice2java/ruby/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926745255211003612L; + public static final long serialVersionUID = -5926743374987738409L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index 31a8b5ee2703..25408994d041 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890916463756473080L; + public static final long serialVersionUID = -8890910411784831367L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index 756ada6c6012..a1a13d257131 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B1.java +++ b/slice2java/ruby/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 99536737540660804L; + public static final long serialVersionUID = -5735149208699786620L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index c5b8abf5ff13..a33735418389 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Base.java +++ b/slice2java/ruby/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3404989218673652457L; + public static final long serialVersionUID = 6696392592165210895L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 972f040136a3..0e91483fcf01 100644 --- a/slice2java/ruby/test/Ice/objects/Test/C.java +++ b/slice2java/ruby/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4548958699362727592L; + public static final long serialVersionUID = -8234779498380943235L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index 50e8107b8df4..65f23e2b6b15 100644 --- a/slice2java/ruby/test/Ice/objects/Test/COneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050969136215144793L; + public static final long serialVersionUID = 3050969239705267101L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index 9a9b5385590a..2ca9852d9be6 100644 --- a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -55165456731220261L; + public static final long serialVersionUID = 1671882540715824219L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index f83c5b726ca2..80aab2c491ca 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D.java +++ b/slice2java/ruby/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8562338996323124522L; + public static final long serialVersionUID = -9116338029170733266L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index 0d3b683cfcd7..879d5af39fc4 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 836191405387138691L; + public static final long serialVersionUID = -6455126956810906941L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index 2da3e846dd9a..4748bac3cd35 100644 --- a/slice2java/ruby/test/Ice/objects/Test/E.java +++ b/slice2java/ruby/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2556155329566731170L; + public static final long serialVersionUID = -5931416188445422772L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index fd7c0503d54b..28a53fb2c18b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EBase.java +++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -7798468760658989298L; + public static final long serialVersionUID = -6259460852114562738L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index 754a42febd2a..9be1a2e0b874 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java +++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2080973819987308306L; + public static final long serialVersionUID = 6907482926725718866L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index 5bebb209a367..bc2c4d1cdc32 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225284279706631210L; + public static final long serialVersionUID = -6225284052425531630L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index 2d144409d8ba..6d132e043643 100644 --- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1099137082367065644L; + public static final long serialVersionUID = 4270573663975365844L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index a265db262e80..f85db910173c 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F.java +++ b/slice2java/ruby/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2653926384455329711L; + public static final long serialVersionUID = -3827867549282451375L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index 844bec690489..a2e99e963dbf 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F1.java +++ b/slice2java/ruby/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192369543262543927L; + public static final long serialVersionUID = 6192369216438245021L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index 9683f8f8ee42..d720dcd0e10b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F3.java +++ b/slice2java/ruby/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4538717941561482545L; + public static final long serialVersionUID = 4374409249838637377L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index 84f46f486a8e..084cfc20b940 100644 --- a/slice2java/ruby/test/Ice/objects/Test/K.java +++ b/slice2java/ruby/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645161040805423624L; + public static final long serialVersionUID = 4645159165515553145L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index ee5f483a475d..7f48325c2d29 100644 --- a/slice2java/ruby/test/Ice/objects/Test/L.java +++ b/slice2java/ruby/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629737264397508143L; + public static final long serialVersionUID = 6629747247447134492L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index fc989b8d106a..5e8c4112599f 100644 --- a/slice2java/ruby/test/Ice/objects/Test/M.java +++ b/slice2java/ruby/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088091254723079142L; + public static final long serialVersionUID = -8088105409293668309L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index 3680610fb9be..b12727af9c2c 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Recursive.java +++ b/slice2java/ruby/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617877136203001317L; + public static final long serialVersionUID = 3617885840812215376L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index 646f3b62629d..48f15123f164 100644 --- a/slice2java/ruby/test/Ice/objects/Test/S.java +++ b/slice2java/ruby/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481768598280250780L; + public static final long serialVersionUID = 481774645092197167L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index ee3c2b0e1dbc..fb4f82cc502e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227744696804256192L; + public static final long serialVersionUID = 6227745239209817220L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index 969e65f6ff8a..cacb57ac74fe 100644 --- a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = 5995970905130530882L; + public static final long serialVersionUID = -6573671248394446014L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index 8200e3fc0299..f8ec70482dc9 100644 --- a/slice2java/ruby/test/Ice/objects/Test/StructKey.java +++ b/slice2java/ruby/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = -1452026720291406098L; + public static final long serialVersionUID = -4798526107778096256L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index e58547e1fea5..3228ff495348 100644 --- a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723850441401651618L; + public static final long serialVersionUID = 2723846251856967925L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index c86f4bd13f1e..f76fddfd3f6b 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 725884130511915039L; + public static final long serialVersionUID = -9082127577507479505L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index 67f0c547cdcd..1f9f9feec55f 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 5050484942083969341L; + public static final long serialVersionUID = -8560058963171802787L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index 1113801587e1..86c875e31a5c 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = -1516664114552828618L; + public static final long serialVersionUID = -3913807920866639770L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index 17c6b09f95dd..ec54e599a57b 100644 --- a/slice2java/ruby/test/Ice/operations/Test/Structure.java +++ b/slice2java/ruby/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = -535577146699685752L; + public static final long serialVersionUID = 5437855682603895307L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index 87398e826b4b..d92a90092264 100644 --- a/slice2java/ruby/test/Ice/optional/Test/A.java +++ b/slice2java/ruby/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7239490258000498032L; + public static final long serialVersionUID = 6220654907073850896L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index 40d3bb40c2e3..3cad5138a489 100644 --- a/slice2java/ruby/test/Ice/optional/Test/B.java +++ b/slice2java/ruby/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7239190968643115677L; + public static final long serialVersionUID = -4148596022837614749L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index 0adcf016fadf..c5bcf11b79ec 100644 --- a/slice2java/ruby/test/Ice/optional/Test/C.java +++ b/slice2java/ruby/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6884799157803477501L; + public static final long serialVersionUID = -4121573723190906499L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java index 11a48aa6fed8..811eb1c3e926 100644 --- a/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4360001300589334104L; + public static final long serialVersionUID = 4359994643133504516L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/D.java b/slice2java/ruby/test/Ice/optional/Test/D.java index 4296ad13b751..c65649c82eec 100644 --- a/slice2java/ruby/test/Ice/optional/Test/D.java +++ b/slice2java/ruby/test/Ice/optional/Test/D.java @@ -180,7 +180,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1758059108381065056L; + public static final long serialVersionUID = 2063041839018351204L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index eaf8594d0d17..919a00d5437c 100644 --- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1516147837422961122L; + public static final long serialVersionUID = 3782424703487381470L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index 86fa00068fcb..21cd693203a3 100644 --- a/slice2java/ruby/test/Ice/optional/Test/E.java +++ b/slice2java/ruby/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399093070133272510L; + public static final long serialVersionUID = 4399099887785633495L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 13190d4e9832..d57c530ad74a 100644 --- a/slice2java/ruby/test/Ice/optional/Test/F.java +++ b/slice2java/ruby/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111939619571959565L; + public static final long serialVersionUID = 2111949167391928164L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 2c7dd56c845c..f3f171e2141d 100644 --- a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569609474177229033L; + public static final long serialVersionUID = 1569605381426064053L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index 2ebacbcb4ccb..805248f5b78e 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G.java +++ b/slice2java/ruby/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4293900198934882707L; + public static final long serialVersionUID = -133154519542359981L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index 0af2de5f497e..630162ecfa57 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G1.java +++ b/slice2java/ruby/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356160893206272411L; + public static final long serialVersionUID = -356164980732644540L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index 6c614506bfb8..3ed72f8fdcb6 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G2.java +++ b/slice2java/ruby/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44040047173667634L; + public static final long serialVersionUID = 44033389802835771L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index b255dd97fc55..c5f4dc9fe568 100644 --- a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8212215830075678221L; + public static final long serialVersionUID = 8854747629353454546L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index da503894f2db..1d62be6de2c1 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219607318867354617L; + public static final long serialVersionUID = -7219600495951827109L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index bb435f28e7ed..dfe2e770bedd 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8925566466531382858L; + public static final long serialVersionUID = 3711540232209470512L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index 505efc5d1b85..acecd4f24abb 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3353606722318647662L; + public static final long serialVersionUID = -2148210715681405347L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/Recursive.java b/slice2java/ruby/test/Ice/optional/Test/Recursive.java index 9bd610441b13..05217408bed8 100644 --- a/slice2java/ruby/test/Ice/optional/Test/Recursive.java +++ b/slice2java/ruby/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055416900996706620L; + public static final long serialVersionUID = 9055423718791407269L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index 19753c8828c5..f5d7fcc30f94 100644 --- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -1270143791686904487L; + public static final long serialVersionUID = -3964041578734632359L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index 6e0829a37e47..b1b98b9bd890 100644 --- a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700996007642766300L; + public static final long serialVersionUID = 6700983729590602058L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index 27bc2784e9c5..79de4c856efa 100644 --- a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912281443533346236L; + public static final long serialVersionUID = -1912288426680472475L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index 1600dc28ac03..20736ce13e08 100644 --- a/slice2java/ruby/test/Ice/optional/Test/WD.java +++ b/slice2java/ruby/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7786359268035750933L; + public static final long serialVersionUID = 5647827533836254998L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index 1eb82483a4a0..ecd27911d435 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190243857809228778L; + public static final long serialVersionUID = -5190251999384719054L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index b10a842b4042..2a5150c96928 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C1.java +++ b/slice2java/ruby/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893235220549379405L; + public static final long serialVersionUID = 8893237901636377105L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index c1416069acb6..d7828beb7e47 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C2.java +++ b/slice2java/ruby/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9187711948677761588L; + public static final long serialVersionUID = -7765717693611088717L; /** @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 934a137d7f59..52bffd409a57 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615627605439216732L; + public static final long serialVersionUID = 4615624919158091892L; /** @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 46f736b4fb89..c6b14f719088 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672588159112297153L; + public static final long serialVersionUID = 672596383314539665L; /** @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 07d3bd13ea69..685c3fe64341 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654437414158855841L; + public static final long serialVersionUID = 8654434567611651789L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index cc1ecfaefd12..9bf352e21e6d 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694614106004659949L; + public static final long serialVersionUID = 3694622169769371393L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index a6d945f68c2f..642c6ec2af77 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159701886127241427L; + public static final long serialVersionUID = 2159704815338021375L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index f21dcb55a3e5..a4e095fd1044 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S1.java +++ b/slice2java/ruby/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241683634941735284L; + public static final long serialVersionUID = 1241675653836504616L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index 17e5e94d2241..fa14cada375f 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S2.java +++ b/slice2java/ruby/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = -8435617221621069259L; + public static final long serialVersionUID = 3957800460147697226L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index 4c2d16f6ea21..2846b37afa55 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477021354678546659L; + public static final long serialVersionUID = -477017041192925831L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java index dd026c1cce40..0934523646f9 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435645236418721575L; + public static final long serialVersionUID = -8435640602634547907L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index a7bd4e1a8c9f..e13d3fb2e90c 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485211255460058171L; + public static final long serialVersionUID = 3485210434078926751L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 5315696d5510..1e06b4689055 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717374951042807370L; + public static final long serialVersionUID = 1717371319433160174L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 25a9dd126f8c..72a4bb8ada19 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384920882551294829L; + public static final long serialVersionUID = -7384916930643373193L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 37a455357677..1b2bbd363bb4 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733698423845825066L; + public static final long serialVersionUID = -2733703057626514062L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 1ab5ad593cac..5f93850d062a 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528103980899181727L; + public static final long serialVersionUID = 4528108294389402491L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index 67412c1ebd17..ab38fd4e5684 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7378818595348352889L; + public static final long serialVersionUID = -6840550742731668985L; /** @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 3b19540da0a1..051b45a1384c 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 1126971168224936523L; + public static final long serialVersionUID = -5415342069651075637L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index c1882a7ed75f..11b53382cf39 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6396997986764140702L; + public static final long serialVersionUID = -6397005549590792739L; /** @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 e4d00a18947b..2650ee4be14f 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066884574809032875L; + public static final long serialVersionUID = -9066881902717921077L; /** @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 f7844ccf5374..e6d505349c59 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8598227897597965764L; + public static final long serialVersionUID = 7592613346503728132L; /** @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 fefe8424a2b1..3055017df4a5 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3469837040412565529L; + public static final long serialVersionUID = 6205810318619658000L; /** @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 964bc053340f..fb28d6e7a5ed 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5351934461551765985L; + public static final long serialVersionUID = 2387379979244394913L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index 67c16820d88f..c2e8fa0da8be 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655930575259525170L; + public static final long serialVersionUID = -7655917052323753520L; /** @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 bed1b946f434..f3c495123531 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271121449972123995L; + public static final long serialVersionUID = -2271135138206414917L; /** @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 733daae02294..48196a5c94d1 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481709565487254290L; + public static final long serialVersionUID = 481706914022657292L; /** @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 eaad5918edda..5325460d0903 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426883013595056862L; + public static final long serialVersionUID = -4426884956256842979L; /** @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 f557d613c336..7414dcc7cbb6 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850540019278907983L; + public static final long serialVersionUID = 850536501272930552L; /** @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 a4ab13c47908..db1b55c41203 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328908154616473098L; + public static final long serialVersionUID = -4328902074332429216L; /** @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 7f260d778ec3..738d37550497 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081806399578701182L; + public static final long serialVersionUID = -5081815207382502934L; /** @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 5f5d7d6e0440..ef121c50174d 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643089676811319634L; + public static final long serialVersionUID = 643075988585903948L; /** @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 e8c472e4860f..1c2fb5d12025 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2437999056879990997L; + public static final long serialVersionUID = -2438007178961475787L; /** @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 932661f3020b..1f74a0d897b2 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651536003938212904L; + public static final long serialVersionUID = 3651522295078062646L; /** @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 0451130cadb7..1d1684f6ff3c 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804375911564208141L; + public static final long serialVersionUID = 8804373102703491091L; /** @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 ca7fd55c6a42..b02d992963ba 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353758032465218629L; + public static final long serialVersionUID = -5353755409585087963L; /** @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 2d52d4445d3b..3b1e081b9924 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522143763170139639L; + public static final long serialVersionUID = -6522130036080152169L; /** @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 68c066d7dc46..2f02fc086e6f 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620281428739194122L; + public static final long serialVersionUID = 7620289695512087316L; /** @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 a3efe9ffa0f9..5bbc90d758d1 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = 102333021530705168L; + public static final long serialVersionUID = -2251394193684522864L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index 7e13e34a563a..84d9a70f2cb9 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/and.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/and.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final and _nullMarshalValue = new and(); /** @hidden */ - public static final long serialVersionUID = 1440097102649603603L; + public static final long serialVersionUID = 1440105046392691356L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index b6d7a753c2f3..51fa425701a1 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/display.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/display.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7547779409655991275L; + public static final long serialVersionUID = -5771766825376259597L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index deac6a2a7c3e..452b144798c2 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3375562970513129604L; + public static final long serialVersionUID = 3375555026784555019L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index f2b0e37d1b5b..071cc94540d8 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 107722144284363183L; + public static final long serialVersionUID = 1872563887954466031L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index 221f737469fb..a7e482714af6 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Cls.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5168103031368616070L; + public static final long serialVersionUID = 7638756189310152550L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index 399d7b884f6d..3489fd04aec7 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 9178215201227424466L; + public static final long serialVersionUID = -9103296170495440622L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index cb4088ccdc9c..cdc566225dfe 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/St.java +++ b/slice2java/ruby/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = 1043259445292003728L; + public static final long serialVersionUID = 6688785336294662896L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index 73af33be36bb..c02397718c8b 100644 --- a/slice2java/ruby/test/Slice/macros/Test/Default.java +++ b/slice2java/ruby/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -303725240711940898L; + public static final long serialVersionUID = 7055928828312349278L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index 6edb2c580c87..fc6560cc83a2 100644 --- a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1708577216502215361L; + public static final long serialVersionUID = -2949724218944224449L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 6761639c63b4..46ad553a1c4f 100644 --- a/slice2java/ruby/test/Slice/structure/Test/C.java +++ b/slice2java/ruby/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3172282793693540422L; + public static final long serialVersionUID = -3172279483591965928L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index e6721e34d1c0..d759cb230594 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S1.java +++ b/slice2java/ruby/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = -5542853859150032455L; + public static final long serialVersionUID = -5542850223741531167L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index e3c140522cce..56a3140629bf 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S2.java +++ b/slice2java/ruby/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 7196419736721380480L; + public static final long serialVersionUID = -8606409252704700328L; } diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java index e9341e31e85a..9c63ea298226 100644 --- a/slice2java/scripts/Test/Common/Config.java +++ b/slice2java/scripts/Test/Common/Config.java @@ -493,7 +493,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6701153219240377434L; + public static final long serialVersionUID = 5736711332154748381L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java index a179e757c5d5..c2b6fc88e76f 100644 --- a/slice2java/scripts/Test/Common/OptionOverrides.java +++ b/slice2java/scripts/Test/Common/OptionOverrides.java @@ -402,7 +402,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6081677782945831814L; + public static final long serialVersionUID = -3440132409818577471L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java index 85a04c063906..1f7ffdcd467b 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 */ - public static final long serialVersionUID = 5103745611172741400L; + public static final long serialVersionUID = 5103746875588298591L; } diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java index 5da4e0847efc..e13cd8f8483d 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 */ - public static final long serialVersionUID = 7577600729817208458L; + public static final long serialVersionUID = 7577601955335563085L; } diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java index 2cb212b9cbbf..db0b295b34d7 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 */ - public static final long serialVersionUID = -8656783867190020204L; + public static final long serialVersionUID = -8656782282471710765L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index 611915b25ea5..5e6475f6af0c 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java @@ -99,5 +99,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = 8990437182309745902L; + public static final long serialVersionUID = 8990436803995484351L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index 725c5df934f0..94b73383e1f3 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java @@ -99,5 +99,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -5089376216703263224L; + public static final long serialVersionUID = -5089373067945085788L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index 98067c09c9b1..e8a58483a693 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java @@ -224,5 +224,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final SSLInfo _nullMarshalValue = new SSLInfo(); /** @hidden */ - public static final long serialVersionUID = 3715688031115919733L; + public static final long serialVersionUID = -5415640438293613579L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java index 6c8f3efe468b..39cec7306b80 100644 --- a/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java +++ b/slice2java/slice/Glacier2/com/zeroc/IceMX/SessionMetrics.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8289858612524461444L; + public static final long serialVersionUID = 343071431255794139L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index 17154b73d1e0..64955f3bed43 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(InputStream istr, int private static final EncodingVersion _nullMarshalValue = new EncodingVersion(); /** @hidden */ - public static final long serialVersionUID = 8386607398141035057L; + public static final long serialVersionUID = -4046636669107695375L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index 14782bfe22ec..dbcd14e01f40 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java @@ -171,5 +171,5 @@ static public java.util.Optional ice_read(InputStream istr, int tag) private static final Identity _nullMarshalValue = new Identity(); /** @hidden */ - public static final long serialVersionUID = -3082650897198858715L; + public static final long serialVersionUID = -1505327250881156507L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index bc4373eeee2e..32f7ee874975 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(InputStream istr, int tag) private static final LogMessage _nullMarshalValue = new LogMessage(); /** @hidden */ - public static final long serialVersionUID = 3505535210499836109L; + public static final long serialVersionUID = -5299753001127376424L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index 7885b13507a4..3c05a5587dc1 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(InputStream istr, int private static final ProtocolVersion _nullMarshalValue = new ProtocolVersion(); /** @hidden */ - public static final long serialVersionUID = 8748294639584928804L; + public static final long serialVersionUID = 2579960020364811620L; } diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java index 33f6ce7da390..e26cc00d70a2 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/ChildInvocationMetrics.java @@ -63,7 +63,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6130310867628280294L; + public static final long serialVersionUID = 3404238117621139898L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java index 2bed2d052bdd..ea9776b3a8c4 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/ConnectionMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2772286928632759625L; + public static final long serialVersionUID = -7334472045022350953L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java index 894c611c708e..2b1a9544f15a 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/DispatchMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2145306234470773161L; + public static final long serialVersionUID = -7096880501305444000L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java index 63cd11b89c22..93bc8635d591 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/InvocationMetrics.java @@ -77,7 +77,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8970485019192129617L; + public static final long serialVersionUID = 5139631155552670863L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java index 18e117b9392a..eebf4c4faf4c 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/Metrics.java @@ -82,7 +82,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1114885801942481743L; + public static final long serialVersionUID = 562102799847427990L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java b/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java index 6c23374b9fc7..b5070ac5c8e3 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/MetricsFailures.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final MetricsFailures _nullMarshalValue = new MetricsFailures(); /** @hidden */ - public static final long serialVersionUID = -372594963458212361L; + public static final long serialVersionUID = -7740907316576485565L; } diff --git a/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java index 5d73ae25212f..c3bacd5da80a 100644 --- a/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/IceMX/ThreadMetrics.java @@ -69,7 +69,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7718173866156088209L; + public static final long serialVersionUID = -4455271584171372698L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index abf390cb4c76..395ff76c6cfa 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5447246019555794843L; + public static final long serialVersionUID = 5447254018914643581L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java index 742cdb6fcc5c..df5947148555 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java @@ -278,5 +278,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final AdapterDescriptor _nullMarshalValue = new AdapterDescriptor(); /** @hidden */ - public static final long serialVersionUID = -6404634715391514411L; + public static final long serialVersionUID = 8745805015267549908L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index 5f5c0cf1a412..d111407893fc 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final AdapterDynamicInfo _nullMarshalValue = new AdapterDynamicInfo(); /** @hidden */ - public static final long serialVersionUID = 6417061093809401787L; + public static final long serialVersionUID = 1945563837985562965L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index f554fbc0c558..8b4111003ec8 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java @@ -182,5 +182,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final AdapterInfo _nullMarshalValue = new AdapterInfo(); /** @hidden */ - public static final long serialVersionUID = 1771107266352129605L; + public static final long serialVersionUID = -5174362142688434388L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index f75d77458f95..6490fcf2aa1f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -243189033574779757L; + public static final long serialVersionUID = -243181034234888331L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java index 502da1559a79..e9d6902c2bd1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7644448257313196426L; + public static final long serialVersionUID = 7644439949226152875L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index 71e4e8273ab8..339f8d95a50c 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4699853763338693339L; + public static final long serialVersionUID = 4699861928010041789L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java index 86efa5ee6046..d9f5bd8d37bc 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationDescriptor _nullMarshalValue = new ApplicationDescriptor(); /** @hidden */ - public static final long serialVersionUID = -6395761037134825779L; + public static final long serialVersionUID = 6342697718583518380L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index 73004a3e260a..e10fb9ff6e44 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ApplicationInfo _nullMarshalValue = new ApplicationInfo(); /** @hidden */ - public static final long serialVersionUID = -4214650368734490620L; + public static final long serialVersionUID = -5653912257588433906L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index ed09aab3e120..524b9ff4e5f1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7270579375979763692L; + public static final long serialVersionUID = -7270587667213890766L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java index 50873fba37fc..5c6a1439af64 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java @@ -364,5 +364,5 @@ static public java.util.Optional ice_read(com.zeroc private static final ApplicationUpdateDescriptor _nullMarshalValue = new ApplicationUpdateDescriptor(); /** @hidden */ - public static final long serialVersionUID = -3838768777620045755L; + public static final long serialVersionUID = -4793906016636819196L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index 69f7feb8fb3f..07c0bf9e063e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationUpdateInfo _nullMarshalValue = new ApplicationUpdateInfo(); /** @hidden */ - public static final long serialVersionUID = 1629815378971640576L; + public static final long serialVersionUID = 4503764452006993670L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index 92056f0e0852..1ec59ac8be80 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4463361204804310130L; + public static final long serialVersionUID = 4463369614985324564L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java index a38a58827263..8fe2909d9662 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1971524170117910766L; + public static final long serialVersionUID = -1971526772577738061L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java index c274ddce669f..b84476138196 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2108809690162669523L; + public static final long serialVersionUID = -2108801382075625972L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java index 0b6b48f2ab99..96cada961d61 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java @@ -71,7 +71,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6574919561567387955L; + public static final long serialVersionUID = 1465723385149187341L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index 200c199a2dc4..e98dd18e9fe1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6801510127445983470L; + public static final long serialVersionUID = -6801502048023510604L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java index e65022cb8394..1b3517860813 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java @@ -183,5 +183,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final DistributionDescriptor _nullMarshalValue = new DistributionDescriptor(); /** @hidden */ - public static final long serialVersionUID = -7258443736575455090L; + public static final long serialVersionUID = 7739792429273149806L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index edf60d6e4186..315884b169de 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java @@ -78,5 +78,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8985154247232008031L; + public static final long serialVersionUID = -8985151581646428025L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java index 0cf63aaa9376..a35a8936ce01 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2337763643268816030L; + public static final long serialVersionUID = 2337761040808988735L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java index 1c40cf858cbf..27fede6d06df 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6003728351211157249L; + public static final long serialVersionUID = -6003725498284814754L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index d3c41b8fa059..a7e045003bed 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LoadInfo _nullMarshalValue = new LoadInfo(); /** @hidden */ - public static final long serialVersionUID = -6173947131283546386L; + public static final long serialVersionUID = 7642522822087537454L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java index 70b84e3f0bed..be6cb4edff0a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final NodeDescriptor _nullMarshalValue = new NodeDescriptor(); /** @hidden */ - public static final long serialVersionUID = 1842620911859892037L; + public static final long serialVersionUID = 8596008476633370661L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 09568663cd4d..614f622311f4 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java @@ -181,5 +181,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final NodeDynamicInfo _nullMarshalValue = new NodeDynamicInfo(); /** @hidden */ - public static final long serialVersionUID = -9159555960974816663L; + public static final long serialVersionUID = -7684298525983105432L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index 690544e3a9f2..82de9de612e6 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java @@ -265,5 +265,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - public static final long serialVersionUID = -5194089612231133558L; + public static final long serialVersionUID = 1267397306073054477L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index dc4f66cd6601..2ec00670288f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5774526887107015346L; + public static final long serialVersionUID = -5774529591589658392L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index 11587b869092..3ea6ceaca955 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 5487488711115575588L; + public static final long serialVersionUID = -5226412505875725084L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java index dcaf400ce83a..07f591c057c1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java @@ -293,5 +293,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.In private static final NodeUpdateDescriptor _nullMarshalValue = new NodeUpdateDescriptor(); /** @hidden */ - public static final long serialVersionUID = 1647757910429140405L; + public static final long serialVersionUID = -1967882806350865579L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java index 621de0a2f5c2..59f65fea6b66 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java @@ -184,5 +184,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final ObjectDescriptor _nullMarshalValue = new ObjectDescriptor(); /** @hidden */ - public static final long serialVersionUID = -9003422471662376947L; + public static final long serialVersionUID = 8419427115797979052L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index 38e61ecec7b4..ff8a233e685c 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 6991427665043348891L; + public static final long serialVersionUID = 6991424919521641628L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index cbc74a1dca6b..bc7437cb2fab 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ObjectInfo _nullMarshalValue = new ObjectInfo(); /** @hidden */ - public static final long serialVersionUID = -3117530630382475047L; + public static final long serialVersionUID = -5659221737937296489L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index f8ca7604dc04..d8bb50b78770 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7672374542853376198L; + public static final long serialVersionUID = 7672382748853166785L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index fc4b20868892..d1b680fc4149 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java @@ -74,5 +74,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2733101744593074696L; + public static final long serialVersionUID = 2733093745229233039L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index 7f90f6e45e41..aabd01ea448a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5694235284386924349L; + public static final long serialVersionUID = -5694235561976714579L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java index b4bacb2d4100..81fa1816d9c9 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PatchException.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -74635604996894301L; + public static final long serialVersionUID = -74638270371042448L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 5d58d5528e1d..06261d161801 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7526799938186719367L; + public static final long serialVersionUID = 7526796988299237473L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java index 2f06d80fcb2e..8509e0ef690a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final PropertyDescriptor _nullMarshalValue = new PropertyDescriptor(); /** @hidden */ - public static final long serialVersionUID = 2604698049621670692L; + public static final long serialVersionUID = -6511486534893129980L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java index a782e7f0a05e..e6240e58b728 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final PropertySetDescriptor _nullMarshalValue = new PropertySetDescriptor(); /** @hidden */ - public static final long serialVersionUID = -7318480525454099997L; + public static final long serialVersionUID = 7368130155999546467L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index f29b9dcc6254..3cf689fec092 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final RegistryInfo _nullMarshalValue = new RegistryInfo(); /** @hidden */ - public static final long serialVersionUID = 2087246416493049831L; + public static final long serialVersionUID = 4347832335985420391L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index 12eaf16dfe19..767fa3567fd1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 8544187944896144443L; + public static final long serialVersionUID = 8544196109724026013L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index 3dbe185fb145..743bc2779ad9 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3775555493265314831L; + public static final long serialVersionUID = -1576049479504391887L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java index 68fe91d263b3..1219449b2867 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java @@ -232,5 +232,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final ReplicaGroupDescriptor _nullMarshalValue = new ReplicaGroupDescriptor(); /** @hidden */ - public static final long serialVersionUID = -5624543035572982927L; + public static final long serialVersionUID = -3347832803272922831L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java index 75e6952a51b7..15202b83391a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java @@ -136,7 +136,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6756877275357203310L; + public static final long serialVersionUID = 5925761247405416691L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index 628c38a11183..56e1b4d536ad 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final ServerDynamicInfo _nullMarshalValue = new ServerDynamicInfo(); /** @hidden */ - public static final long serialVersionUID = -264971251871401067L; + public static final long serialVersionUID = -8360637076208547920L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index 3d0b78f7c88c..b9f280a2239b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java @@ -229,5 +229,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ServerInfo _nullMarshalValue = new ServerInfo(); /** @hidden */ - public static final long serialVersionUID = -643314399540206976L; + public static final long serialVersionUID = 927487043442370557L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java index 8c6fb939c553..efd12cdeab9d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ic private static final ServerInstanceDescriptor _nullMarshalValue = new ServerInstanceDescriptor(); /** @hidden */ - public static final long serialVersionUID = 7022396412609662679L; + public static final long serialVersionUID = -7935623531191280681L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index c2e742419226..7fb56cc147ba 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2699426076117092383L; + public static final long serialVersionUID = -2699423245219012409L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index 65316915b9b5..2b362c79c357 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 804811615326067207L; + public static final long serialVersionUID = 9094164150258502855L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index f1f916e913be..376955c099f7 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6858523198824884481L; + public static final long serialVersionUID = 1600390784957385791L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index 27a5cc3f3827..784db95a5f67 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java @@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7786549359506851231L; + public static final long serialVersionUID = 4560994533005629345L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java index bf4538fdd4d2..67329c078684 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8904235719076590535L; + public static final long serialVersionUID = 8851579582086777113L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java index 66423a53b122..5d14e4eef49a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java @@ -198,5 +198,5 @@ static public java.util.Optional ice_read(com.zeroc.I private static final ServiceInstanceDescriptor _nullMarshalValue = new ServiceInstanceDescriptor(); /** @hidden */ - public static final long serialVersionUID = -4224254264989147609L; + public static final long serialVersionUID = -8197694861660067481L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java index 74e2b938a281..10e98dea4024 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java @@ -198,5 +198,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final TemplateDescriptor _nullMarshalValue = new TemplateDescriptor(); /** @hidden */ - public static final long serialVersionUID = 7752118082034589126L; + public static final long serialVersionUID = -4565026227009754265L; } diff --git a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java index 5a3c99ff6ce4..f5f58182a5f8 100644 --- a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java +++ b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileAccessException.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5996626833831968136L; + public static final long serialVersionUID = -5996621412401249260L; } diff --git a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java index 863d2fd10045..1722f23c5126 100644 --- a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java +++ b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/FileInfo.java @@ -188,5 +188,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final FileInfo _nullMarshalValue = new FileInfo(); /** @hidden */ - public static final long serialVersionUID = 8317288185683446830L; + public static final long serialVersionUID = 7517028730984803118L; } diff --git a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java index 774ccd29520d..db1f0ca938fc 100644 --- a/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java +++ b/slice2java/slice/IcePatch2/com/zeroc/IcePatch2/LargeFileInfo.java @@ -188,5 +188,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final LargeFileInfo _nullMarshalValue = new LargeFileInfo(); /** @hidden */ - public static final long serialVersionUID = 1816240712108344962L; + public static final long serialVersionUID = 6615819853969165698L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java index 7ebfb2bd9a48..860481d323e1 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceMX/SubscriberMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5777155633704989890L; + public static final long serialVersionUID = 3726749396911428396L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java index 79925d5e7c81..6a50e7858cb5 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceMX/TopicMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5475464712553276991L; + public static final long serialVersionUID = -6180146530865484991L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index 4a2d1dd52a5d..803addf5d38b 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7896656412786934963L; + public static final long serialVersionUID = 7896653881658202538L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index 4547ae673ef4..2fa368c3bea4 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1090058642196343662L; + public static final long serialVersionUID = -1090061175905642357L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index b35d5bc63a00..3681f0cab118 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 243158990377903546L; + public static final long serialVersionUID = 243155779801810083L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index bc015c49102d..e66255115753 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java @@ -178,5 +178,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LinkInfo _nullMarshalValue = new LinkInfo(); /** @hidden */ - public static final long serialVersionUID = 1591696695115667588L; + public static final long serialVersionUID = -2435264017106471011L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index cd1efa93582a..278a25c4f2b6 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8653879214228950698L; + public static final long serialVersionUID = -8653870341706807601L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index c415711add1f..4cc5559a14ab 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -6283748153973927561L; + public static final long serialVersionUID = -6283739278871218194L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index 0919c4151c3a..0378cc8e740d 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java @@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3979365890344399195L; + public static final long serialVersionUID = 3979362847656632642L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index 0bcf694703e3..955310a8b896 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3654578996158344118L; + public static final long serialVersionUID = 3162974561092117119L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index 49c7f5a8b245..388470dd5c14 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java @@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2392035732912806722L; + public static final long serialVersionUID = -4714150212544376693L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index 9ca187ccc30a..a6c1eb196a04 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1256531058017212524L; + public static final long serialVersionUID = -6518471483194094467L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index 68fb575f57c4..a788e5afd55f 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java @@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1512638269357243995L; + public static final long serialVersionUID = 9012595112608583498L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index 2a1dc3d60983..09e49794670e 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - public static final long serialVersionUID = 779693174970774938L; + public static final long serialVersionUID = -8802851014778382014L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index d5eabe46cee6..391542362201 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - public static final long serialVersionUID = 6513679148159646846L; + public static final long serialVersionUID = -6003449328580179982L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index c0274a37ba22..39aa66435204 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - public static final long serialVersionUID = 1243941570126142616L; + public static final long serialVersionUID = 463752842839535552L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index e93740599a03..1544d23d65f7 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/A.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 7823737121307764220L; + public static final long serialVersionUID = 7823737683207983534L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index 3900ba987bd1..91f8c37ba75d 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/B.java +++ b/slice2java/swift/test/Ice/exceptions/Test/B.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -3861418777052314180L; + public static final long serialVersionUID = -3861412760295268114L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index 4865793270d2..9498749f5bfe 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/C.java +++ b/slice2java/swift/test/Ice/exceptions/Test/C.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1080690812510549500L; + public static final long serialVersionUID = 1080691374410768814L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index 24facc8dacba..f097f8555d87 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/D.java +++ b/slice2java/swift/test/Ice/exceptions/Test/D.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4780373491049764028L; + public static final long serialVersionUID = 4780379507806810094L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index eb2799deb5b4..7448b34cd7a1 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/E.java +++ b/slice2java/swift/test/Ice/exceptions/Test/E.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1876976250870948257L; + public static final long serialVersionUID = -1876971517753507827L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index 405e54d738fc..d1a76aa53976 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/F.java +++ b/slice2java/swift/test/Ice/exceptions/Test/F.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 733472681286850524L; + public static final long serialVersionUID = 733472119689501326L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index aedcd9ecb170..368f3cdb5e0a 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4641410833699677848L; + public static final long serialVersionUID = -4641411555438051014L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index d0129e387a56..d9f1e07d3dc1 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 954232975481803954L; + public static final long serialVersionUID = 954230252905900790L; /** @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 0436e36a5804..b7b8f5abf1e1 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1339629740964173864L; + public static final long serialVersionUID = 1339643383870373868L; /** @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 812ce41129c1..2c7179a427aa 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2729304919849434582L; + public static final long serialVersionUID = -2729307642425337746L; /** @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 83533ed29c97..70d34f3b796b 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3435402438644885204L; + public static final long serialVersionUID = -3435399385757056280L; /** @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 311355bce842..96a5babce3b5 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -836177913101683083L; + public static final long serialVersionUID = -836185770534977743L; /** @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 5645f6a16f3d..81d16c223c63 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1132523998478932552L; + public static final long serialVersionUID = 1132526731064008972L; /** @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 2101d1689773..081822e7493e 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6335559212810045110L; + public static final long serialVersionUID = -6335551025064267634L; /** @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 d150e57bdf13..115a93dbc657 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4007408684748666292L; + public static final long serialVersionUID = -4007416542181960952L; /** @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 f7fda114743a..f0c5aeb27ac3 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 991426477969363892L; + public static final long serialVersionUID = 991429530857192816L; /** @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 d6094e37bef0..853e0f6f8968 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2880332585696171928L; + public static final long serialVersionUID = -2880330183423299796L; /** @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 cfcbf521821a..a83148dd903c 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8808271372224605846L; + public static final long serialVersionUID = -8808263514791032658L; /** @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 aa2f0ef4bd7c..24801d413f6b 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -771851564747785620L; + public static final long serialVersionUID = -771859752493284568L; /** @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 3cde3e50c23c..41d3afda3024 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6566352523206536823L; + public static final long serialVersionUID = 6566350120933943219L; /** @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 dfb860659bb3..e3439239e059 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6983795623451027080L; + public static final long serialVersionUID = 6983808936045022796L; /** @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 55eceeeeed78..b464548c979c 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1175217771880240246L; + public static final long serialVersionUID = -1175220824768347698L; /** @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 2b5647f2b89a..8df6874d4b60 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -3279722272793548404L; + public static final long serialVersionUID = -3279719550217923768L; /** @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 648466be7bf7..4d4d57778e32 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4359168434920272970L; + public static final long serialVersionUID = -4359181747514547214L; /** @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 d8bacf1e639f..d08fd95d81bb 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5904686528515561896L; + public static final long serialVersionUID = 5904700171421761900L; /** @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 2f6bf6243128..4edaa4413225 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1835751867701953450L; + public static final long serialVersionUID = 1835749145126050286L; /** @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 298b40570830..b2e9451cdeab 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2252403091875202388L; + public static final long serialVersionUID = -2252400038987373464L; /** @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 e3e6c9331380..4f3757ecca99 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1203536345745581191L; + public static final long serialVersionUID = -1203533613160504771L; /** @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 1e01a3fd1a96..7d4783a5caab 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7537768033108352568L; + public static final long serialVersionUID = -7537765300523276148L; /** @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 2082c0153f41..9bd5121f16e2 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3440892829312221386L; + public static final long serialVersionUID = 3440901017057998862L; /** @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 8c803386f623..1694169c025c 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9151100798155305420L; + public static final long serialVersionUID = 9151092940722010760L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java b/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java index c52f3e1cee12..7f02542db1e0 100644 --- a/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java +++ b/slice2java/swift/test/Ice/interceptor/Test/InvalidInputException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8742727440227184508L; + public static final long serialVersionUID = -8742719811433104979L; } diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index 00e3cc462329..cca0995f9ee2 100644 --- a/slice2java/swift/test/Ice/objects/Test/A.java +++ b/slice2java/swift/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1685684911548964604L; + public static final long serialVersionUID = 2475460081887082436L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index cb7dd5e601b6..d6aa3dadc2da 100644 --- a/slice2java/swift/test/Ice/objects/Test/A1.java +++ b/slice2java/swift/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5926743857828389170L; + public static final long serialVersionUID = -5926742977070812890L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index 89fea70790d9..3af64f93c93b 100644 --- a/slice2java/swift/test/Ice/objects/Test/B.java +++ b/slice2java/swift/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8890915061125954950L; + public static final long serialVersionUID = -8890910569552012462L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index a3e065e1c6e7..151afaafc85b 100644 --- a/slice2java/swift/test/Ice/objects/Test/B1.java +++ b/slice2java/swift/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7799237411916221180L; + public static final long serialVersionUID = -5068299046456198716L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 2cc14442efac..ca3ec6d32cf7 100644 --- a/slice2java/swift/test/Ice/objects/Test/Base.java +++ b/slice2java/swift/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6567698609603662428L; + public static final long serialVersionUID = -6561761092012144036L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index ca6f18c7f582..c2f788e63e52 100644 --- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3897767009344254748L; + public static final long serialVersionUID = 3897772353414853364L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index 00fe8aabcfb6..64cd4c5570eb 100644 --- a/slice2java/swift/test/Ice/objects/Test/C.java +++ b/slice2java/swift/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2161880637369107510L; + public static final long serialVersionUID = -4705703507840610974L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index b557dce6c7f4..014eb43d720d 100644 --- a/slice2java/swift/test/Ice/objects/Test/COneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3050979207159555829L; + public static final long serialVersionUID = 3050969420571962781L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index 708e9c0d5354..f2955f06aafc 100644 --- a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4583697578630937445L; + public static final long serialVersionUID = 9091623751885512411L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index d18bed09deff..c37577a6a51c 100644 --- a/slice2java/swift/test/Ice/objects/Test/D.java +++ b/slice2java/swift/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6649212505873325658L; + public static final long serialVersionUID = 1063332824058814066L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index 610e346deba5..12e0df72663a 100644 --- a/slice2java/swift/test/Ice/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1513539373583118659L; + public static final long serialVersionUID = 3552245301275558787L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index 38570e5a2516..de1d13dce209 100644 --- a/slice2java/swift/test/Ice/objects/Test/Derived.java +++ b/slice2java/swift/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1587928598936498974L; + public static final long serialVersionUID = -1587931948993217297L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 9cc35c7115ab..1ee588c1822e 100644 --- a/slice2java/swift/test/Ice/objects/Test/E.java +++ b/slice2java/swift/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6065475726485532426L; + public static final long serialVersionUID = 9019128224540852150L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index 6faa874ef7ad..14fb3eb4a6b1 100644 --- a/slice2java/swift/test/Ice/objects/Test/EBase.java +++ b/slice2java/swift/test/Ice/objects/Test/EBase.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -4478424021743306546L; + public static final long serialVersionUID = -2651952165661087090L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index 8cea59f446bd..5b699db68cb9 100644 --- a/slice2java/swift/test/Ice/objects/Test/EDerived.java +++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1495527952688850734L; + public static final long serialVersionUID = -3068451967841905646L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index d63bd523278c..71d48b9c3dee 100644 --- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -6225290217953541574L; + public static final long serialVersionUID = -6225284233286372846L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index 874dbc9caae7..8a56c0ac63c5 100644 --- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java @@ -76,5 +76,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -2474928043599720428L; + public static final long serialVersionUID = -4740257451409892652L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index f0598cc6aff1..5db26f7052a4 100644 --- a/slice2java/swift/test/Ice/objects/Test/F.java +++ b/slice2java/swift/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 529213814018463569L; + public static final long serialVersionUID = -2143781650543140271L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index 1f0fb4c03ae8..b2faece51ac4 100644 --- a/slice2java/swift/test/Ice/objects/Test/F1.java +++ b/slice2java/swift/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6192372465936449410L; + public static final long serialVersionUID = 6192374109896786899L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index 1ea89d76611a..361c4491743d 100644 --- a/slice2java/swift/test/Ice/objects/Test/F3.java +++ b/slice2java/swift/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -432518862849871163L; + public static final long serialVersionUID = -3306741786915631803L; /** @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 7fa0fc4586f1..222863e4e304 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1425257528020820208L; + public static final long serialVersionUID = -1425257969703009672L; /** @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 e97da03230c3..6445bcd5f070 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2337225690724698505L; + public static final long serialVersionUID = -2337226897093070177L; } 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 e0e7bcc6b464..d5b20dcb9073 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1298675917244439912L; + public static final long serialVersionUID = -1298687439565975184L; /** @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 867cb03f0137..afc2b4f6457a 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1842241618575720339L; + public static final long serialVersionUID = 1842229827648539707L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index 355a924342da..dd11189c69eb 100644 --- a/slice2java/swift/test/Ice/objects/Test/K.java +++ b/slice2java/swift/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4645159643430038167L; + public static final long serialVersionUID = 4645159284401802815L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index fa6d1d304a8d..540d2d20d35b 100644 --- a/slice2java/swift/test/Ice/objects/Test/L.java +++ b/slice2java/swift/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6629735856692637445L; + public static final long serialVersionUID = 6629747374179361325L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index f36202bbdeed..ef5036019c75 100644 --- a/slice2java/swift/test/Ice/objects/Test/M.java +++ b/slice2java/swift/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8088100757351561624L; + public static final long serialVersionUID = -8088105848474692800L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 91908f7dfd6e..dd01ec5455c3 100644 --- a/slice2java/swift/test/Ice/objects/Test/Recursive.java +++ b/slice2java/swift/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3617875728531324493L; + public static final long serialVersionUID = 3617885597929404645L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index c13cf0cc8d6b..9b8727e610e9 100644 --- a/slice2java/swift/test/Ice/objects/Test/S.java +++ b/slice2java/swift/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 481769995643887158L; + public static final long serialVersionUID = 481774322085301150L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index d0cb87f61e5b..56ab4f083a69 100644 --- a/slice2java/swift/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - public static final long serialVersionUID = 6227751151636188076L; + public static final long serialVersionUID = 6227744738201654532L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index 53db00151048..0d6100916319 100644 --- a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - public static final long serialVersionUID = 7749696739110021762L; + public static final long serialVersionUID = -4699625752012214718L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index 31e94e466303..75f6d7e00371 100644 --- a/slice2java/swift/test/Ice/objects/Test/StructKey.java +++ b/slice2java/swift/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - public static final long serialVersionUID = 2691369949431053754L; + public static final long serialVersionUID = 2934070129892008058L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index 10e8fec81531..30457e02f385 100644 --- a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - public static final long serialVersionUID = 2723851186495798945L; + public static final long serialVersionUID = 2723850753934728725L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index 581433ddecfe..9583b958345f 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4968814998377949256L; + public static final long serialVersionUID = -1007160585135914244L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index 482955e89f85..e8a4ecec3089 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - public static final long serialVersionUID = 4175549923472517821L; + public static final long serialVersionUID = 1556395871204319869L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index bf57099c7a35..d4c185936976 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - public static final long serialVersionUID = 2387900420183508961L; + public static final long serialVersionUID = 618668469301865941L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index c49af121e55d..7271d15be465 100644 --- a/slice2java/swift/test/Ice/operations/Test/Structure.java +++ b/slice2java/swift/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - public static final long serialVersionUID = 2676754068676604274L; + public static final long serialVersionUID = 4695034580973413830L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index 9121e1f1b535..5435efdc33e1 100644 --- a/slice2java/swift/test/Ice/optional/Test/A.java +++ b/slice2java/swift/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4966862409311469456L; + public static final long serialVersionUID = -3393215602143362672L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index 6cf714992e44..6c1f58001080 100644 --- a/slice2java/swift/test/Ice/optional/Test/B.java +++ b/slice2java/swift/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8220362080660346717L; + public static final long serialVersionUID = -5872817479673494685L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index 3f5cb5c6f2e7..98f88baa276a 100644 --- a/slice2java/swift/test/Ice/optional/Test/C.java +++ b/slice2java/swift/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 1509211105778871677L; + public static final long serialVersionUID = -2033165397397891587L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java b/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java index 83a0f7c8c979..5ba9f29eda57 100644 --- a/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/ClassVarStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ClassVarStruct _nullMarshalValue = new ClassVarStruct(); /** @hidden */ - public static final long serialVersionUID = 4360002909753660641L; + public static final long serialVersionUID = 4359994539830457303L; } diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index ad4e57011237..ab21e6688bd0 100644 --- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java @@ -221,5 +221,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 2049915662509764421L; + public static final long serialVersionUID = -4556149379834034491L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 0cdf17ec2449..456e736f7e4a 100644 --- a/slice2java/swift/test/Ice/optional/Test/E.java +++ b/slice2java/swift/test/Ice/optional/Test/E.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4399096921290610076L; + public static final long serialVersionUID = 4399099825726534954L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index 4560975da53d..e20c83f6cd0f 100644 --- a/slice2java/swift/test/Ice/optional/Test/F.java +++ b/slice2java/swift/test/Ice/optional/Test/F.java @@ -103,7 +103,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2111940908304913711L; + public static final long serialVersionUID = 2111949064153187737L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index 454c9e6531b8..57d990ae89e2 100644 --- a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - public static final long serialVersionUID = 1569613645462382544L; + public static final long serialVersionUID = 1569605484756711270L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index 7e1726999346..2f1d46de28ca 100644 --- a/slice2java/swift/test/Ice/optional/Test/G.java +++ b/slice2java/swift/test/Ice/optional/Test/G.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 434477670333536275L; + public static final long serialVersionUID = 3305760518310833875L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index c037e9de1450..59be64f7d88b 100644 --- a/slice2java/swift/test/Ice/optional/Test/G1.java +++ b/slice2java/swift/test/Ice/optional/Test/G1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -356162016631165356L; + public static final long serialVersionUID = -356165003913146398L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index fb1395beedb0..5edfd930ef6c 100644 --- a/slice2java/swift/test/Ice/optional/Test/G2.java +++ b/slice2java/swift/test/Ice/optional/Test/G2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 44041656490247844L; + public static final long serialVersionUID = 44033286383896338L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 698a70cd78b7..bc355a97c86d 100644 --- a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java @@ -1855,7 +1855,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2850251592712732077L; + public static final long serialVersionUID = 5534545272259285421L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 7582fef5f5a5..3f7a1f2751b4 100644 --- a/slice2java/swift/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7219608762572122498L; + public static final long serialVersionUID = -7219600392800577784L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index ef57035ce575..23b3b751c047 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java @@ -273,5 +273,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1472148298910566164L; + public static final long serialVersionUID = 350104557355365652L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index 3af2c48ef6b8..47c2abb7ebbe 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java @@ -241,7 +241,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6703061536013482682L; + public static final long serialVersionUID = 1862477854115884208L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/Recursive.java b/slice2java/swift/test/Ice/optional/Test/Recursive.java index fdbe16f549ee..7d26e4b46e77 100644 --- a/slice2java/swift/test/Ice/optional/Test/Recursive.java +++ b/slice2java/swift/test/Ice/optional/Test/Recursive.java @@ -114,7 +114,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 9055420751997551173L; + public static final long serialVersionUID = 9055423860946667635L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index 65a0a4aac9f4..ef9c11bb2c58 100644 --- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java @@ -96,5 +96,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 7691466857192043842L; + public static final long serialVersionUID = 5598384831033994370L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index 5557f70999de..fba6de7c004d 100644 --- a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = 6700991991180046919L; + public static final long serialVersionUID = 6700983587520782001L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index a973a44226a8..debe5b21cbe4 100644 --- a/slice2java/swift/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - public static final long serialVersionUID = -1912285459998429195L; + public static final long serialVersionUID = -1912288364474522941L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index 80729abb4e8e..63e7f473d14a 100644 --- a/slice2java/swift/test/Ice/optional/Test/WD.java +++ b/slice2java/swift/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5143964617146894147L; + public static final long serialVersionUID = -2033478418631898365L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index 95ba8f31af64..1f0f2d55a86c 100644 --- a/slice2java/swift/test/Ice/scope/Test/C.java +++ b/slice2java/swift/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5190252178971721473L; + public static final long serialVersionUID = -5190249969035658094L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index 4c85b7b70a2d..ff7f26bf02e0 100644 --- a/slice2java/swift/test/Ice/scope/Test/C1.java +++ b/slice2java/swift/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8893237595640744643L; + public static final long serialVersionUID = 8893230431785871561L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 9d72d3b6f77c..6f0d059e7496 100644 --- a/slice2java/swift/test/Ice/scope/Test/C2.java +++ b/slice2java/swift/test/Ice/scope/Test/C2.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8644406452651072770L; + public static final long serialVersionUID = 2456281381765144368L; /** @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 6cb8dd9ed642..35a925e646d9 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4615625264088902013L; + public static final long serialVersionUID = 4615625616583511906L; /** @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 89f6ba452a73..991e129f6086 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 672596242480900643L; + public static final long serialVersionUID = 672580560107515846L; /** @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 847096b64f9e..12bd0026055b 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 8654434708300938723L; + public static final long serialVersionUID = 8654442202922084901L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index 2b13f5a87b7f..a481fe616c92 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 3694622155492119087L; + public static final long serialVersionUID = 3694613284631031657L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index f1d4b5641697..99fc03fbe3b3 100644 --- a/slice2java/swift/test/Ice/scope/Test/S.java +++ b/slice2java/swift/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - public static final long serialVersionUID = 2159704994923243281L; + public static final long serialVersionUID = 2159705517735170263L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index ca7573d95431..2aa94c79935c 100644 --- a/slice2java/swift/test/Ice/scope/Test/S1.java +++ b/slice2java/swift/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - public static final long serialVersionUID = 1241675308922658554L; + public static final long serialVersionUID = 1241672068554326128L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index f0d8e21875e8..986087103b80 100644 --- a/slice2java/swift/test/Ice/scope/Test/S2.java +++ b/slice2java/swift/test/Ice/scope/Test/S2.java @@ -193,5 +193,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - public static final long serialVersionUID = 8189557017853033339L; + public static final long serialVersionUID = -6771693322289499959L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index 623d4995825f..416e2e2cae55 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -477024265661187232L; + public static final long serialVersionUID = -477023281717845383L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java index b22f75dcc199..68c1328eb8fd 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8435636751482707036L; + public static final long serialVersionUID = -8435630312378664131L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index e0ae4f48f839..60b091fa5654 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3485214290557358342L; + public static final long serialVersionUID = 3485209814330664607L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2015367d301e..63bb42a6b79d 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 1717377531238737015L; + public static final long serialVersionUID = 1717377229190481774L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 3bd73f20deb9..d87ecb0aa157 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -7384918178207358098L; + public static final long serialVersionUID = -7384912420998401801L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java index d90309395306..471819b9ddec 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -97,5 +97,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) protected com.zeroc.Ice.SlicedData _slicedData; /** @hidden */ - public static final long serialVersionUID = -2733707035349111573L; + public static final long serialVersionUID = -2733709380653794830L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 9261c12eb6be..5ef7b5aa2ac8 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 4528095454608928866L; + public static final long serialVersionUID = 4528101893712971771L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java index 34edb0af6bf2..9d4445a7dfe8 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6137357536259675591L; + public static final long serialVersionUID = 6137358340768288721L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java index 1c15f6ff758d..525c7eb3b850 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 751745214992191335L; + public static final long serialVersionUID = 751740564340103409L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java index 92ac26fc17e9..ce2544b50340 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4272737994924822432L; + public static final long serialVersionUID = -4272734380169228426L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java index c5400355d48a..2975715068e1 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved1.java @@ -74,5 +74,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 6612524117850553928L; + public static final long serialVersionUID = 6612522811089259744L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java index 3663d566d6a0..68434eaba030 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreserved2.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3036461463123345832L; + public static final long serialVersionUID = 3036465451077128768L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java index 185d8e719329..21be5a867813 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/SPreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 691105055853714441L; + public static final long serialVersionUID = 691109165310217780L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 97a56dff767c..0c6bdc00cb80 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = 3424368192123666960L; + public static final long serialVersionUID = 3424380613466079341L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index b4e5d0ec85f0..f17bc00ca2b9 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1172601784476490687L; + public static final long serialVersionUID = -1172597840318113540L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index bb39dbb63862..cf85397eafa4 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1126115910097088840L; + public static final long serialVersionUID = -1126108948934342395L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 982a80867bd8..e1cf79749534 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2097585545275052008L; + public static final long serialVersionUID = -2097573123951613339L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index 3e9f111c85ac..f6eda5941ef2 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5409781465409974745L; + public static final long serialVersionUID = -1470655862962888281L; /** @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 46582d8bea0f..0b31e03ac08c 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java @@ -78,5 +78,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = -3294037081495893525L; + public static final long serialVersionUID = -8697160116485678485L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index 35964f9ccde1..28be4a8f6722 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6396997401644166332L; + public static final long serialVersionUID = -6397005468309417886L; /** @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 367cd896aa65..6c08915f7923 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9066884669198539892L; + public static final long serialVersionUID = -9066879913861823828L; /** @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 529a737c954e..2421a114c0b7 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 5638426935301636100L; + public static final long serialVersionUID = -5064627011954531708L; /** @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 bb464a4ce4bd..a28c90b7292c 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -1807856268445627941L; + public static final long serialVersionUID = 7082767056025016283L; /** @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 4ea495462805..ce28227517ca 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -564422954905774991L; + public static final long serialVersionUID = -261846851331182747L; /** @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 7185fd339ef6..e06f7d7a4b56 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 206278424801166963L; + public static final long serialVersionUID = 5509663127351569715L; /** @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 82e1facb6c51..3c6bec1b5643 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -5852185619754282712L; + public static final long serialVersionUID = -6918290929358384984L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index 0febe1aceb93..c1bfd563cf5a 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -7655930480997980265L; + public static final long serialVersionUID = -7655919196307404297L; /** @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 19afbe570647..a522340ec794 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2271121378906643588L; + public static final long serialVersionUID = -2271132829056913252L; /** @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 a168248dc5d6..71afe47dad4b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 4147524722889529850L; + public static final long serialVersionUID = 4147524523055986050L; /** @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 c7018b141e4a..e2ceef3a97f0 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 481709762946482712L; + public static final long serialVersionUID = 481704925107470904L; /** @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 04c7ade925ab..b1b897dc31c1 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4426882428778678268L; + public static final long serialVersionUID = -4426885205287533022L; /** @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 0807480ee260..136a3f78f64b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 850540276302335678L; + public static final long serialVersionUID = 850536585042528852L; /** @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 e438f01438ba..d82ae2e02107 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4328908052620704280L; + public static final long serialVersionUID = -4328901830297934666L; /** @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 e772adb74e20..25451e56818e 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5081806504094318382L; + public static final long serialVersionUID = -5081815454134129532L; /** @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 dcfbf8ccf8a2..2c761a4fca8d 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 643089665075407755L; + public static final long serialVersionUID = 643078297735207403L; /** @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 252d7ef944c8..92b98c55987f 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2437998797163347856L; + public static final long serialVersionUID = -2438003712485838000L; /** @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 9a825d76e07b..c58fb1737185 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8864558672156247774L; + public static final long serialVersionUID = 4561131407020213286L; /** @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 d03b11dbfd97..20c63e168b37 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -8813708725493519996L; + public static final long serialVersionUID = -8813708447564562884L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java index f0bc16a7c67e..09059874096e 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -73,5 +73,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 4410703973446571131L; + public static final long serialVersionUID = 4410703569297665795L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java index 8750e6f63736..90ff0fe30318 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 3651536054387192185L; + public static final long serialVersionUID = 3651524604237057689L; /** @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 96471f6c9244..d164ad659f47 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8804375548596450652L; + public static final long serialVersionUID = 8804375091568726844L; /** @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 7d3b8ca5fff4..0fbb58b03b1e 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -4989056967435899392L; + public static final long serialVersionUID = -4989057454377400328L; /** @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 4df595aa9fa3..533cf3941360 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -5353757607492969878L; + public static final long serialVersionUID = -5353757233123656758L; /** @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 ace6211f6d28..1f1be3316ab9 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -6522144043285972923L; + public static final long serialVersionUID = -6522133667784247323L; /** @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 35879eddc755..ab327b379bd0 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 7620281230976015046L; + public static final long serialVersionUID = 7620286063801092262L; /** @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 e98565d0252e..1846b2f10cfb 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - public static final long serialVersionUID = 2537163412994100192L; + public static final long serialVersionUID = -4518959315832727904L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index 739254b4695e..2d3060d2ca1e 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 2357119313611197893L; + public static final long serialVersionUID = 6102727914224613061L; /** @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 35929ef10eab..41ab29a43a30 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -2839277605325889450L; + public static final long serialVersionUID = 3912507786771513814L; } diff --git a/slice2java/swift/test/Ice/stream/Test/ClassStruct.java b/slice2java/swift/test/Ice/stream/Test/ClassStruct.java index c4fed6159b4f..1dbe815adc38 100644 --- a/slice2java/swift/test/Ice/stream/Test/ClassStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/ClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - public static final long serialVersionUID = 4995619669366003502L; + public static final long serialVersionUID = 4995617378235541373L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index beb2072d95c7..37ae933bfdb6 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyClass.java +++ b/slice2java/swift/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -2272712027915682022L; + public static final long serialVersionUID = 4329061881362367281L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index f193b154196c..bc20a7e9bde7 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyException.java +++ b/slice2java/swift/test/Ice/stream/Test/MyException.java @@ -70,5 +70,5 @@ public boolean _usesClasses() } /** @hidden */ - public static final long serialVersionUID = 5734226206093623096L; + public static final long serialVersionUID = 5734225276300629263L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index 82565dbd7555..fec37ecbf0da 100644 --- a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 6102763692075006214L; + public static final long serialVersionUID = 2574439386968301495L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/SmallStruct.java b/slice2java/swift/test/Ice/stream/Test/SmallStruct.java index 365d374c31c8..0a32ba3e33c4 100644 --- a/slice2java/swift/test/Ice/stream/Test/SmallStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/SmallStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - public static final long serialVersionUID = -3184582675962084852L; + public static final long serialVersionUID = -8995749584652408117L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java index 1c8413797191..8e110ed0b83a 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final NestedClassStruct _nullMarshalValue = new NestedClassStruct(); /** @hidden */ - public static final long serialVersionUID = -2609321249453624857L; + public static final long serialVersionUID = -2609315190101701836L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java index 044d85975dd3..3ffd4852b9e0 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -1404709861267137527L; + public static final long serialVersionUID = -1404702445754630383L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 8bc029f54766..79ce12d3ccc5 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - public static final long serialVersionUID = 7576679372333610527L; + public static final long serialVersionUID = 860659859019913572L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java index c91e83730653..45636839dc0f 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedClassStruct2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final NestedClassStruct2 _nullMarshalValue = new NestedClassStruct2(); /** @hidden */ - public static final long serialVersionUID = 9184120088500070421L; + public static final long serialVersionUID = 9184127504313296710L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index 529a5bc958d4..1087d31f0295 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8562124598620850821L; + public static final long serialVersionUID = -8562123663667435165L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 8b73f686a0dc..d2914967937b 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - public static final long serialVersionUID = -8921479631177892774L; + public static final long serialVersionUID = 3684647896608938508L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index e60e7cec597d..b6c965870962 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Cls.java +++ b/slice2java/swift/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = 8368957768983716843L; + public static final long serialVersionUID = 3593937003727018194L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index 0d028c2e09f1..dac8121e61e3 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Ex.java +++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java @@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -4487008241803603831L; + public static final long serialVersionUID = 3689365832728189458L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index b7d0e8df92bc..5fcfd95cf830 100644 --- a/slice2java/swift/test/Slice/escape/Clash/St.java +++ b/slice2java/swift/test/Slice/escape/Clash/St.java @@ -173,5 +173,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - public static final long serialVersionUID = -4160214038926917182L; + public static final long serialVersionUID = -3792099558890501332L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index 6ac36f31a456..1425489dde2a 100644 --- a/slice2java/swift/test/Slice/escape/and/_return.java +++ b/slice2java/swift/test/Slice/escape/and/_return.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -8206188357837099703L; + public static final long serialVersionUID = -8206186920491035816L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index 7e1bcc92ab0d..16d007e30fe3 100644 --- a/slice2java/swift/test/Slice/escape/and/_switch.java +++ b/slice2java/swift/test/Slice/escape/and/_switch.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - public static final long serialVersionUID = -9180468810866201018L; + public static final long serialVersionUID = 2176466158474503170L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index c332e17cb88d..180d3e9708f8 100644 --- a/slice2java/swift/test/Slice/escape/and/as.java +++ b/slice2java/swift/test/Slice/escape/and/as.java @@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - public static final long serialVersionUID = -675885273239814152L; + public static final long serialVersionUID = -4376467256912071112L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index 3aa921947340..1d21b2aaf874 100644 --- a/slice2java/swift/test/Slice/escape/and/defer.java +++ b/slice2java/swift/test/Slice/escape/and/defer.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final defer _nullMarshalValue = new defer(); /** @hidden */ - public static final long serialVersionUID = 8824795028263787144L; + public static final long serialVersionUID = 8824799046184356275L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index 86f58759c7e4..2007bfe32991 100644 --- a/slice2java/swift/test/Slice/escape/and/guard.java +++ b/slice2java/swift/test/Slice/escape/and/guard.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final guard _nullMarshalValue = new guard(); /** @hidden */ - public static final long serialVersionUID = 6403721933586638207L; + public static final long serialVersionUID = 6403717931408261614L; } diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js index 469be6433d2c..377ef448f93c 100644 --- a/slice2js/cpp/src/IceGrid/Internal.js +++ b/slice2js/cpp/src/IceGrid/Internal.js @@ -623,8 +623,8 @@ "registerWellKnownObjects": [, 2, 2, , , [["IceGrid.ObjectInfoSeqHelper"]], , , , ], "setAdapterDirectProxy": [, 2, 2, , , [[7], [7], [9]], , [ - IceGrid.AdapterNotExistException, - IceGrid.AdapterExistsException + IceGrid.AdapterExistsException, + IceGrid.AdapterNotExistException ], , ], "receivedUpdate": [, , , , , [[IceGrid.TopicName._helper], [3], [7]], , , , ], "destroy": [, , , , , , , , , ] @@ -731,13 +731,13 @@ { "registerNode": [, , , , ["IceGrid.NodeSessionPrx"], [["IceGrid.InternalNodeInfo", true], ["IceGrid.NodePrx"], [IceGrid.LoadInfo]], , [ - IceGrid.PermissionDeniedException, - IceGrid.NodeActiveException + IceGrid.NodeActiveException, + IceGrid.PermissionDeniedException ], true, ], "registerReplica": [, , , , ["IceGrid.ReplicaSessionPrx"], [["IceGrid.InternalReplicaInfo", true], ["IceGrid.InternalRegistryPrx"]], , [ - IceGrid.PermissionDeniedException, - IceGrid.ReplicaActiveException + IceGrid.ReplicaActiveException, + IceGrid.PermissionDeniedException ], true, ], "registerWithReplica": [, , , , , [["IceGrid.InternalRegistryPrx"]], , , , ], "getNodes": [, 2, 2, , ["IceGrid.NodePrxSeqHelper"], , , , , ], diff --git a/slice2js/slice/Glacier2/Router.js b/slice2js/slice/Glacier2/Router.js index d2fc9d591a33..642b12a997a6 100644 --- a/slice2js/slice/Glacier2/Router.js +++ b/slice2js/slice/Glacier2/Router.js @@ -99,13 +99,13 @@ Slice.defineOperations(Glacier2.Router, Glacier2.RouterPrx, iceC_Glacier2_Router "getCategoryForClient": [, 2, 1, , [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 9058ab7fd30f..89d05292fd31 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.CannotCreateSessionException', 'Glacier2.PermissionDeniedException' } - createSessionFromSecureConnection_ex_ = { 'Glacier2.CannotCreateSessionException', 'Glacier2.PermissionDeniedException' } + createSession_ex_ = { 'Glacier2.PermissionDeniedException', 'Glacier2.CannotCreateSessionException' } + createSessionFromSecureConnection_ex_ = { 'Glacier2.PermissionDeniedException', 'Glacier2.CannotCreateSessionException' } refreshSession_ex_ = { 'Glacier2.SessionNotExistException' } destroySession_ex_ = { 'Glacier2.SessionNotExistException' } end diff --git a/slice2matlab/slice/IceGrid/+IceGrid/AdminPrx.m b/slice2matlab/slice/IceGrid/+IceGrid/AdminPrx.m index bc3d4f5d96a9..23eabde21726 100644 --- a/slice2matlab/slice/IceGrid/+IceGrid/AdminPrx.m +++ b/slice2matlab/slice/IceGrid/+IceGrid/AdminPrx.m @@ -2010,14 +2010,14 @@ function shutdown(obj, varargin) end end properties(Constant,Access=private) - addApplication_ex_ = { 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - syncApplication_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - updateApplication_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - syncApplicationWithoutRestart_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - updateApplicationWithoutRestart_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - removeApplication_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - instantiateServer_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException', 'IceGrid.AccessDeniedException' } - patchApplication_ex_ = { 'IceGrid.ApplicationNotExistException', 'IceGrid.PatchException' } + addApplication_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.DeploymentException' } + syncApplication_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException' } + updateApplication_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException' } + syncApplicationWithoutRestart_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException' } + updateApplicationWithoutRestart_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException' } + removeApplication_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException' } + instantiateServer_ex_ = { 'IceGrid.AccessDeniedException', 'IceGrid.ApplicationNotExistException', 'IceGrid.DeploymentException' } + patchApplication_ex_ = { 'IceGrid.PatchException', 'IceGrid.ApplicationNotExistException' } getApplicationInfo_ex_ = { 'IceGrid.ApplicationNotExistException' } getDefaultApplicationDescriptor_ex_ = { 'IceGrid.DeploymentException' } getServerInfo_ex_ = { 'IceGrid.ServerNotExistException' } @@ -2028,8 +2028,8 @@ function shutdown(obj, varargin) isServerEnabled_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } startServer_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.ServerStartException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } stopServer_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.ServerStopException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } - patchServer_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException', 'IceGrid.PatchException' } - sendSignal_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException', 'IceGrid.BadSignalException' } + patchServer_ex_ = { 'IceGrid.PatchException', 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } + sendSignal_ex_ = { 'IceGrid.BadSignalException', 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } getAdapterInfo_ex_ = { 'IceGrid.AdapterNotExistException' } removeAdapter_ex_ = { 'IceGrid.AdapterNotExistException', 'IceGrid.DeploymentException' } addObject_ex_ = { 'IceGrid.ObjectExistsException', 'IceGrid.DeploymentException' } @@ -2045,8 +2045,8 @@ function shutdown(obj, varargin) shutdownNode_ex_ = { 'IceGrid.NodeNotExistException', 'IceGrid.NodeUnreachableException' } getNodeHostname_ex_ = { 'IceGrid.NodeNotExistException', 'IceGrid.NodeUnreachableException' } pingRegistry_ex_ = { 'IceGrid.RegistryNotExistException' } - getRegistryInfo_ex_ = { 'IceGrid.RegistryNotExistException', 'IceGrid.RegistryUnreachableException' } + getRegistryInfo_ex_ = { 'IceGrid.RegistryUnreachableException', 'IceGrid.RegistryNotExistException' } getRegistryAdmin_ex_ = { 'IceGrid.RegistryNotExistException' } - shutdownRegistry_ex_ = { 'IceGrid.RegistryNotExistException', 'IceGrid.RegistryUnreachableException' } + shutdownRegistry_ex_ = { 'IceGrid.RegistryUnreachableException', 'IceGrid.RegistryNotExistException' } end end diff --git a/slice2matlab/slice/IceGrid/+IceGrid/AdminSessionPrx.m b/slice2matlab/slice/IceGrid/+IceGrid/AdminSessionPrx.m index 3a2f0ab29024..541afe061e43 100644 --- a/slice2matlab/slice/IceGrid/+IceGrid/AdminSessionPrx.m +++ b/slice2matlab/slice/IceGrid/+IceGrid/AdminSessionPrx.m @@ -743,12 +743,12 @@ function finishUpdate(obj, varargin) setObserversByIdentity_ex_ = { 'IceGrid.ObserverAlreadyRegisteredException' } startUpdate_ex_ = { 'IceGrid.AccessDeniedException' } finishUpdate_ex_ = { 'IceGrid.AccessDeniedException' } - openServerLog_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException', 'IceGrid.FileNotAvailableException' } - openServerStdErr_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException', 'IceGrid.FileNotAvailableException' } - openServerStdOut_ex_ = { 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException', 'IceGrid.FileNotAvailableException' } - openNodeStdErr_ex_ = { 'IceGrid.NodeNotExistException', 'IceGrid.NodeUnreachableException', 'IceGrid.FileNotAvailableException' } - openNodeStdOut_ex_ = { 'IceGrid.NodeNotExistException', 'IceGrid.NodeUnreachableException', 'IceGrid.FileNotAvailableException' } - openRegistryStdErr_ex_ = { 'IceGrid.RegistryNotExistException', 'IceGrid.RegistryUnreachableException', 'IceGrid.FileNotAvailableException' } - openRegistryStdOut_ex_ = { 'IceGrid.RegistryNotExistException', 'IceGrid.RegistryUnreachableException', 'IceGrid.FileNotAvailableException' } + openServerLog_ex_ = { 'IceGrid.FileNotAvailableException', 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } + openServerStdErr_ex_ = { 'IceGrid.FileNotAvailableException', 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } + openServerStdOut_ex_ = { 'IceGrid.FileNotAvailableException', 'IceGrid.ServerNotExistException', 'IceGrid.DeploymentException', 'IceGrid.NodeUnreachableException' } + openNodeStdErr_ex_ = { 'IceGrid.FileNotAvailableException', 'IceGrid.NodeNotExistException', 'IceGrid.NodeUnreachableException' } + openNodeStdOut_ex_ = { 'IceGrid.FileNotAvailableException', 'IceGrid.NodeNotExistException', 'IceGrid.NodeUnreachableException' } + openRegistryStdErr_ex_ = { 'IceGrid.RegistryUnreachableException', 'IceGrid.FileNotAvailableException', 'IceGrid.RegistryNotExistException' } + openRegistryStdOut_ex_ = { 'IceGrid.RegistryUnreachableException', 'IceGrid.FileNotAvailableException', 'IceGrid.RegistryNotExistException' } end end diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift index 8672d931783b..a8cd41f31420 100644 --- a/slice2swift/cpp/src/IceGrid/Internal.swift +++ b/slice2swift/cpp/src/IceGrid/Internal.swift @@ -4466,10 +4466,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) @@ -4511,10 +4511,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as NodeActiveException { - throw error } catch let error as PermissionDeniedException { throw error + } catch let error as NodeActiveException { + throw error } catch is Ice.UserException {} }, context: context, diff --git a/slice2swift/java/test/src/main/java/test/Ice/servantLocator/Test.swift b/slice2swift/java/test/src/main/java/test/Ice/servantLocator/Test.swift index 291b7a5579f2..bce52bb76029 100644 --- a/slice2swift/java/test/src/main/java/test/Ice/servantLocator/Test.swift +++ b/slice2swift/java/test/src/main/java/test/Ice/servantLocator/Test.swift @@ -560,10 +560,10 @@ public extension TestIntfPrx { userException:{ ex in do { throw ex - } catch let error as TestIntfUserException { - throw error } catch let error as TestImpossibleException { throw error + } catch let error as TestIntfUserException { + throw error } catch is Ice.UserException {} }, context: context) @@ -596,10 +596,10 @@ public extension TestIntfPrx { userException:{ ex in do { throw ex - } catch let error as TestIntfUserException { - throw error } catch let error as TestImpossibleException { throw error + } catch let error as TestIntfUserException { + throw error } catch is Ice.UserException {} }, context: context, @@ -616,10 +616,10 @@ public extension TestIntfPrx { userException:{ ex in do { throw ex - } catch let error as TestIntfUserException { - throw error } catch let error as TestImpossibleException { throw error + } catch let error as TestIntfUserException { + throw error } catch is Ice.UserException {} }, context: context) @@ -643,10 +643,10 @@ public extension TestIntfPrx { userException:{ ex in do { throw ex - } catch let error as TestIntfUserException { - throw error } catch let error as TestImpossibleException { throw error + } catch let error as TestIntfUserException { + throw error } catch is Ice.UserException {} }, context: context, @@ -663,10 +663,10 @@ public extension TestIntfPrx { userException:{ ex in do { throw ex - } catch let error as TestIntfUserException { - throw error } catch let error as TestImpossibleException { throw error + } catch let error as TestIntfUserException { + throw error } catch is Ice.UserException {} }, context: context) @@ -690,10 +690,10 @@ public extension TestIntfPrx { userException:{ ex in do { throw ex - } catch let error as TestIntfUserException { - throw error } catch let error as TestImpossibleException { throw error + } catch let error as TestIntfUserException { + throw error } catch is Ice.UserException {} }, context: context, diff --git a/slice2swift/slice/Glacier2/Router.swift b/slice2swift/slice/Glacier2/Router.swift index 2bb560707274..5f11bd4fd7a5 100644 --- a/slice2swift/slice/Glacier2/Router.swift +++ b/slice2swift/slice/Glacier2/Router.swift @@ -278,10 +278,10 @@ public extension RouterPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as CannotCreateSessionException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context) @@ -324,10 +324,10 @@ public extension RouterPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as CannotCreateSessionException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context, @@ -365,10 +365,10 @@ public extension RouterPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as CannotCreateSessionException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context) @@ -404,10 +404,10 @@ public extension RouterPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as CannotCreateSessionException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context, diff --git a/slice2swift/slice/IceGrid/Admin.swift b/slice2swift/slice/IceGrid/Admin.swift index cbf4389ee604..9992793076b7 100644 --- a/slice2swift/slice/IceGrid/Admin.swift +++ b/slice2swift/slice/IceGrid/Admin.swift @@ -2002,10 +2002,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as AccessDeniedException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2036,10 +2036,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as AccessDeniedException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2073,11 +2073,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2110,11 +2110,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2148,11 +2148,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2184,11 +2184,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2224,11 +2224,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2262,11 +2262,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2302,11 +2302,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2340,11 +2340,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2377,11 +2377,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2412,11 +2412,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2455,11 +2455,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2496,11 +2496,11 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as AccessDeniedException { throw error } catch let error as ApplicationNotExistException { throw error - } catch let error as AccessDeniedException { + } catch let error as DeploymentException { throw error } catch is Ice.UserException {} }, @@ -2533,10 +2533,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as PatchException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2569,10 +2569,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as ApplicationNotExistException { - throw error } catch let error as PatchException { throw error + } catch let error as ApplicationNotExistException { + throw error } catch is Ice.UserException {} }, context: context, @@ -2853,10 +2853,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -2892,10 +2892,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -2934,10 +2934,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -2973,10 +2973,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3058,10 +3058,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3097,10 +3097,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3137,10 +3137,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3176,10 +3176,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3218,10 +3218,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3257,10 +3257,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3295,12 +3295,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error } catch let error as ServerStartException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3332,12 +3332,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error } catch let error as ServerStartException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3372,12 +3372,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error } catch let error as ServerStopException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3409,12 +3409,12 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error } catch let error as ServerStopException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} @@ -3452,13 +3452,13 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as PatchException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as PatchException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -3492,13 +3492,13 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as PatchException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as PatchException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -3535,10 +3535,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch let error as BadSignalException { @@ -3575,10 +3575,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ServerNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch let error as NodeUnreachableException { throw error } catch let error as BadSignalException { @@ -3723,10 +3723,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as AdapterNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context) @@ -3756,10 +3756,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as AdapterNotExistException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context, @@ -3831,10 +3831,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectExistsException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context) @@ -3865,10 +3865,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectExistsException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context, @@ -3899,10 +3899,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectNotRegisteredException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context) @@ -3933,10 +3933,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectNotRegisteredException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context, @@ -3968,10 +3968,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectExistsException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4004,10 +4004,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectExistsException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4038,10 +4038,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectNotRegisteredException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4072,10 +4072,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { - throw error } catch let error as ObjectNotRegisteredException { throw error + } catch let error as DeploymentException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4352,10 +4352,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4389,10 +4389,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4427,10 +4427,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4464,10 +4464,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4502,10 +4502,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4539,10 +4539,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4579,10 +4579,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4618,10 +4618,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4650,10 +4650,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4683,10 +4683,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4721,10 +4721,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4758,10 +4758,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -4906,10 +4906,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -4943,10 +4943,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -5044,10 +5044,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -5077,10 +5077,10 @@ public extension AdminPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -7509,13 +7509,13 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as FileNotAvailableException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as FileNotAvailableException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -7558,13 +7558,13 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as FileNotAvailableException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as FileNotAvailableException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -7608,13 +7608,13 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as FileNotAvailableException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as FileNotAvailableException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -7653,13 +7653,13 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as FileNotAvailableException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as FileNotAvailableException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -7703,13 +7703,13 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as FileNotAvailableException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as FileNotAvailableException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -7748,13 +7748,13 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as DeploymentException { + } catch let error as FileNotAvailableException { throw error } catch let error as ServerNotExistException { throw error - } catch let error as NodeUnreachableException { + } catch let error as DeploymentException { throw error - } catch let error as FileNotAvailableException { + } catch let error as NodeUnreachableException { throw error } catch is Ice.UserException {} }, @@ -7796,12 +7796,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -7839,12 +7839,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -7885,12 +7885,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -7928,12 +7928,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as NodeUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as NodeNotExistException { throw error + } catch let error as NodeUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -7974,12 +7974,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -8017,12 +8017,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context, @@ -8063,12 +8063,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context) @@ -8106,12 +8106,12 @@ public extension AdminSessionPrx { userException:{ ex in do { throw ex - } catch let error as RegistryUnreachableException { - throw error } catch let error as FileNotAvailableException { throw error } catch let error as RegistryNotExistException { throw error + } catch let error as RegistryUnreachableException { + throw error } catch is Ice.UserException {} }, context: context,