HEAD:(zeroc-ice/ice@ac784b0b0a) Add support for multi platform xcfram…

…eworks (zeroc-ice/ice#2691)

slice2cpp/cpp/src/IceGrid/Internal.cpp

@@ -1700,11 +1700,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const NodeActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const NodeActiveException&)
             {
                 throw;
             }
@@ -1750,11 +1750,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
             {
                 ex.ice_throw();
             }
-            catch(const ReplicaActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const ReplicaActiveException&)
             {
                 throw;
             }

slice2cs/cpp/src/IceGrid/Internal.cs

@@ -5919,11 +5919,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
                     {
                         throw ex;
                     }
-                    catch(NodeActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
-                    catch(PermissionDeniedException)
+                    catch(NodeActiveException)
                     {
                         throw;
                     }
@@ -5975,11 +5975,11 @@ private void _iceI_registerReplica(InternalReplicaInfo? iceP_info, InternalRegis
                     {
                         throw ex;
                     }
-                    catch(ReplicaActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
-                    catch(PermissionDeniedException)
+                    catch(ReplicaActiveException)
                     {
                         throw;
                     }
@@ -6415,16 +6415,16 @@ public abstract class NodeDisp_ : Ice.ObjectImpl, Node
 
         public abstract void shutdown(Ice.Current current);
 
+        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
+
+        public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
+
         public abstract void replicaInit(InternalRegistryPrx?[] replicas, Ice.Current current);
 
         public abstract void replicaAdded(InternalRegistryPrx? replica, Ice.Current current);
 
         public abstract void replicaRemoved(InternalRegistryPrx? replica, Ice.Current current);
 
-        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
-
-        public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceGrid::Node";

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

@@ -10024,6 +10024,26 @@ 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);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
+
         public abstract global::System.Threading.Tasks.Task<MyClass_OpStructResult> opStructAsync(Structure p1, Structure p2, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
@@ -10144,26 +10164,6 @@ 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<bool> supportsCompressAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task shutdownAsync(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);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";

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

@@ -650,11 +650,11 @@ private void _iceI_intfUserException(bool iceP_throw, global::System.Collections
                     {
                         throw ex;
                     }
-                    catch(TestIntfUserException)
+                    catch(TestImpossibleException)
                     {
                         throw;
                     }
-                    catch(TestImpossibleException)
+                    catch(TestIntfUserException)
                     {
                         throw;
                     }
@@ -700,11 +700,11 @@ private void _iceI_asyncResponse(global::System.Collections.Generic.Dictionary<s
                     {
                         throw ex;
                     }
-                    catch(TestIntfUserException)
+                    catch(TestImpossibleException)
                     {
                         throw;
                     }
-                    catch(TestImpossibleException)
+                    catch(TestIntfUserException)
                     {
                         throw;
                     }
@@ -744,11 +744,11 @@ private void _iceI_asyncException(global::System.Collections.Generic.Dictionary<
                     {
                         throw ex;
                     }
-                    catch(TestIntfUserException)
+                    catch(TestImpossibleException)
                     {
                         throw;
                     }
-                    catch(TestImpossibleException)
+                    catch(TestIntfUserException)
                     {
                         throw;
                     }

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

@@ -13440,6 +13440,34 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
+            public abstract void shutdown(Ice.Current current);
+
+            public abstract bool supportsCompress(Ice.Current current);
+
+            public abstract void opVoid(Ice.Current current);
+
+            public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+            public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+            public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+            public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+            public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+            public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+            public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+            public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
+
+            public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+            public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+            public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
             public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
 
             public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
@@ -13552,34 +13580,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 void shutdown(Ice.Current current);
-
-            public abstract bool supportsCompress(Ice.Current current);
-
-            public abstract void opVoid(Ice.Current current);
-
-            public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-            public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-            public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-            public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-            public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-            public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-            public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-            public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
-            public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-            public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-            public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
             public override string ice_id(Ice.Current current) => ice_staticId();
 
             public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13674,6 +13674,34 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
         public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
 
         public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
@@ -13786,34 +13814,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";