HEAD:(zeroc-ice/ice@42214d433f) RedHat multi-platform build fixes (ze…

…roc-ice/ice#3169)

slice2cpp/slice/Glacier2/Router.cpp

@@ -109,11 +109,11 @@ Glacier2::RouterPrx::_iceI_createSession(const ::std::shared_ptr<::IceInternal::
             {
                 ex.ice_throw();
             }
-            catch(const CannotCreateSessionException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const CannotCreateSessionException&)
             {
                 throw;
             }
@@ -155,11 +155,11 @@ Glacier2::RouterPrx::_iceI_createSessionFromSecureConnection(const ::std::shared
             {
                 ex.ice_throw();
             }
-            catch(const CannotCreateSessionException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const CannotCreateSessionException&)
             {
                 throw;
             }

slice2cs/cpp/src/DataStorm/Contract.cs

@@ -3466,12 +3466,6 @@ public abstract class SessionDisp_ : Ice.ObjectImpl, Session
 
     public abstract class PublisherSessionDisp_ : Ice.ObjectImpl, PublisherSession
     {
-        public abstract void detachElements(long topic, long[] keys, Ice.Current current);
-
-        public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current);
-
-        public abstract void disconnected(Ice.Current current);
-
         public abstract void announceTopics(TopicInfo[] topics, bool initialize, Ice.Current current);
 
         public abstract void attachTopic(TopicSpec topic, Ice.Current current);
@@ -3488,6 +3482,12 @@ public abstract class PublisherSessionDisp_ : Ice.ObjectImpl, PublisherSession
 
         public abstract void attachElementsAck(long topic, ElementSpecAck[] elements, Ice.Current current);
 
+        public abstract void detachElements(long topic, long[] keys, Ice.Current current);
+
+        public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current);
+
+        public abstract void disconnected(Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::DataStormContract::PublisherSession";
@@ -3518,12 +3518,6 @@ public abstract class SubscriberSessionDisp_ : Ice.ObjectImpl, SubscriberSession
     {
         public abstract void s(long topicId, long elementId, DataSample sample, Ice.Current current);
 
-        public abstract void detachElements(long topic, long[] keys, Ice.Current current);
-
-        public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current);
-
-        public abstract void disconnected(Ice.Current current);
-
         public abstract void announceTopics(TopicInfo[] topics, bool initialize, Ice.Current current);
 
         public abstract void attachTopic(TopicSpec topic, Ice.Current current);
@@ -3540,6 +3534,12 @@ public abstract class SubscriberSessionDisp_ : Ice.ObjectImpl, SubscriberSession
 
         public abstract void attachElementsAck(long topic, ElementSpecAck[] elements, Ice.Current current);
 
+        public abstract void detachElements(long topic, long[] keys, Ice.Current current);
+
+        public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current);
+
+        public abstract void disconnected(Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::DataStormContract::SubscriberSession";

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

@@ -13728,6 +13728,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
+
         public abstract string[] opStringLiterals(Ice.Current current);
 
         public abstract string[] opWStringLiterals(Ice.Current current);
@@ -13744,8 +13746,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13961,6 +13961,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
+
         public abstract string[] opStringLiterals(Ice.Current current);
 
         public abstract string[] opWStringLiterals(Ice.Current current);
@@ -13977,8 +13979,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";

slice2cs/cpp/test/Ice/operations/TestAMD.cs

@@ -10024,20 +10024,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
@@ -10164,6 +10150,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";