Skip to content

Commit d82d999

Browse files
bernardnormiertemp
bernardnormier
authored and
temp
committed
HEAD:(zeroc-ice/ice@fa4a4b4899) Update checkedCast in Python (zeroc-ice/ice#2550)
1 parent 788f257 commit d82d999

File tree

1,502 files changed

+2006
-2006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,502 files changed

+2006
-2006
lines changed

‎slice2cpp/cpp/src/IceGrid/Internal.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<
15851585
{
15861586
ex.ice_throw();
15871587
}
1588-
catch(const AdapterExistsException&)
1588+
catch(const AdapterNotExistException&)
15891589
{
15901590
throw;
15911591
}
1592-
catch(const AdapterNotExistException&)
1592+
catch(const AdapterExistsException&)
15931593
{
15941594
throw;
15951595
}
@@ -1700,11 +1700,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
17001700
{
17011701
ex.ice_throw();
17021702
}
1703-
catch(const NodeActiveException&)
1703+
catch(const PermissionDeniedException&)
17041704
{
17051705
throw;
17061706
}
1707-
catch(const PermissionDeniedException&)
1707+
catch(const NodeActiveException&)
17081708
{
17091709
throw;
17101710
}
@@ -1750,11 +1750,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
17501750
{
17511751
ex.ice_throw();
17521752
}
1753-
catch(const ReplicaActiveException&)
1753+
catch(const PermissionDeniedException&)
17541754
{
17551755
throw;
17561756
}
1757-
catch(const PermissionDeniedException&)
1757+
catch(const ReplicaActiveException&)
17581758
{
17591759
throw;
17601760
}

‎slice2cpp/slice/Glacier2/Router.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ Glacier2::RouterPrx::_iceI_createSession(const ::std::shared_ptr<::IceInternal::
109109
{
110110
ex.ice_throw();
111111
}
112-
catch(const CannotCreateSessionException&)
112+
catch(const PermissionDeniedException&)
113113
{
114114
throw;
115115
}
116-
catch(const PermissionDeniedException&)
116+
catch(const CannotCreateSessionException&)
117117
{
118118
throw;
119119
}
@@ -155,11 +155,11 @@ Glacier2::RouterPrx::_iceI_createSessionFromSecureConnection(const ::std::shared
155155
{
156156
ex.ice_throw();
157157
}
158-
catch(const CannotCreateSessionException&)
158+
catch(const PermissionDeniedException&)
159159
{
160160
throw;
161161
}
162-
catch(const PermissionDeniedException&)
162+
catch(const CannotCreateSessionException&)
163163
{
164164
throw;
165165
}

‎slice2cs/cpp/src/IceGrid/Internal.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5900,11 +5900,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl
59005900
{
59015901
throw ex;
59025902
}
5903-
catch(AdapterExistsException)
5903+
catch(AdapterNotExistException)
59045904
{
59055905
throw;
59065906
}
5907-
catch(AdapterNotExistException)
5907+
catch(AdapterExistsException)
59085908
{
59095909
throw;
59105910
}
@@ -6305,11 +6305,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
63056305
{
63066306
throw ex;
63076307
}
6308-
catch(NodeActiveException)
6308+
catch(PermissionDeniedException)
63096309
{
63106310
throw;
63116311
}
6312-
catch(PermissionDeniedException)
6312+
catch(NodeActiveException)
63136313
{
63146314
throw;
63156315
}
@@ -6361,11 +6361,11 @@ private void _iceI_registerReplica(InternalReplicaInfo? iceP_info, InternalRegis
63616361
{
63626362
throw ex;
63636363
}
6364-
catch(ReplicaActiveException)
6364+
catch(PermissionDeniedException)
63656365
{
63666366
throw;
63676367
}
6368-
catch(PermissionDeniedException)
6368+
catch(ReplicaActiveException)
63696369
{
63706370
throw;
63716371
}

‎slice2cs/cpp/test/Ice/location/Test.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,12 +1166,12 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi
11661166
{
11671167
public abstract void addObject(global::Ice.ObjectPrx? obj, Ice.Current current);
11681168

1169+
public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current);
1170+
11691171
public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current);
11701172

11711173
public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current);
11721174

1173-
public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current);
1174-
11751175
public override string ice_id(Ice.Current current) => ice_staticId();
11761176

11771177
public static new string ice_staticId() => "::Test::TestLocatorRegistry";

‎slice2cs/cpp/test/Ice/operations/Test.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13946,6 +13946,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
1394613946

1394713947
public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
1394813948

13949+
public abstract void shutdown(Ice.Current current);
13950+
13951+
public abstract bool supportsCompress(Ice.Current current);
13952+
13953+
public abstract void opVoid(Ice.Current current);
13954+
13955+
public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
13956+
13957+
public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
13958+
13959+
public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
13960+
13961+
public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
13962+
1394913963
public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
1395013964

1395113965
public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
@@ -14072,20 +14086,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
1407214086

1407314087
public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
1407414088

14075-
public abstract void shutdown(Ice.Current current);
14076-
14077-
public abstract bool supportsCompress(Ice.Current current);
14078-
14079-
public abstract void opVoid(Ice.Current current);
14080-
14081-
public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
14082-
14083-
public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
14084-
14085-
public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
14086-
14087-
public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
14088-
1408914089
public override string ice_id(Ice.Current current) => ice_staticId();
1409014090

1409114091
public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -14181,6 +14181,20 @@ namespace Test2
1418114181
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")]
1418214182
public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
1418314183
{
14184+
public abstract void shutdown(Ice.Current current);
14185+
14186+
public abstract bool supportsCompress(Ice.Current current);
14187+
14188+
public abstract void opVoid(Ice.Current current);
14189+
14190+
public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
14191+
14192+
public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
14193+
14194+
public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
14195+
14196+
public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
14197+
1418414198
public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
1418514199

1418614200
public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
@@ -14307,20 +14321,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
1430714321

1430814322
public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
1430914323

14310-
public abstract void shutdown(Ice.Current current);
14311-
14312-
public abstract bool supportsCompress(Ice.Current current);
14313-
14314-
public abstract void opVoid(Ice.Current current);
14315-
14316-
public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
14317-
14318-
public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
14319-
14320-
public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
14321-
14322-
public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
14323-
1432414324
public override string ice_id(Ice.Current current) => ice_staticId();
1432514325

1432614326
public static new string ice_staticId() => "::Test2::MyDerivedClass";

‎slice2cs/csharp/test/Ice/facets/Test.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,12 +1573,12 @@ public abstract class DDisp_ : Ice.ObjectImpl, D
15731573
{
15741574
public abstract string callD(Ice.Current current);
15751575

1576+
public abstract string callC(Ice.Current current);
1577+
15761578
public abstract string callA(Ice.Current current);
15771579

15781580
public abstract string callB(Ice.Current current);
15791581

1580-
public abstract string callC(Ice.Current current);
1581-
15821582
public override string ice_id(Ice.Current current) => ice_staticId();
15831583

15841584
public static new string ice_staticId() => "::Test::D";

‎slice2cs/csharp/test/Ice/location/Test.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,12 +1177,12 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi
11771177
{
11781178
public abstract void addObject(global::Ice.ObjectPrx? obj, Ice.Current current);
11791179

1180+
public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current);
1181+
11801182
public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current);
11811183

11821184
public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current);
11831185

1184-
public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current);
1185-
11861186
public override string ice_id(Ice.Current current) => ice_staticId();
11871187

11881188
public static new string ice_staticId() => "::Test::TestLocatorRegistry";

0 commit comments

Comments
 (0)