HEAD:(zeroc-ice/ice@e5dd5702f3) Fix colloc and IPv6 (zeroc-ice/ice#3161)

InsertCreativityHere · Nov 18, 2024 · a36e426 · a36e426
1 parent 2c1c165
commit a36e426
Show file tree

Hide file tree

Showing 1,511 changed files with 1,821 additions and 1,821 deletions.
diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs
@@ -5521,11 +5521,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl
                     {
                         throw ex;
                     }
-                    catch(AdapterNotExistException)
+                    catch(AdapterExistsException)
                     {
                         throw;
                     }
-                    catch(AdapterExistsException)
+                    catch(AdapterNotExistException)
                     {
                         throw;
                     }
@@ -6503,6 +6503,8 @@ public abstract class NodeSessionDisp_ : Ice.ObjectImpl, NodeSession
 
     public abstract class DatabaseObserverDisp_ : Ice.ObjectImpl, DatabaseObserver
     {
+        public abstract void applicationInit(int serial, ApplicationInfo[] applications, Ice.Current current);
+
         public abstract void applicationAdded(int serial, ApplicationInfo desc, Ice.Current current);
 
         public abstract void applicationRemoved(int serial, string name, Ice.Current current);
@@ -6515,8 +6517,6 @@ public abstract class DatabaseObserverDisp_ : Ice.ObjectImpl, DatabaseObserver
 
         public abstract void adapterUpdated(AdapterInfo info, Ice.Current current);
 
-        public abstract void applicationInit(int serial, ApplicationInfo[] applications, Ice.Current current);
-
         public abstract void adapterRemoved(string id, Ice.Current current);
 
         public abstract void objectInit(ObjectInfo[] objects, Ice.Current current);

diff --git a/slice2cs/cpp/src/IceStorm/IceStormInternal.cs b/slice2cs/cpp/src/IceStorm/IceStormInternal.cs
@@ -1301,6 +1301,14 @@ public abstract class TopicInternalDisp_ : Ice.ObjectImpl, TopicInternal
 
         public abstract void reap(global::Ice.Identity[] id, Ice.Current current);
 
+        public abstract void unlink(TopicPrx? linkTo, Ice.Current current);
+
+        public abstract LinkInfo[] getLinkInfoSeq(Ice.Current current);
+
+        public abstract global::Ice.Identity[] getSubscribers(Ice.Current current);
+
+        public abstract void destroy(Ice.Current current);
+
         public abstract string getName(Ice.Current current);
 
         public abstract global::Ice.ObjectPrx? getPublisher(Ice.Current current);
@@ -1313,14 +1321,6 @@ public abstract class TopicInternalDisp_ : Ice.ObjectImpl, TopicInternal
 
         public abstract void link(TopicPrx? linkTo, int cost, Ice.Current current);
 
-        public abstract void unlink(TopicPrx? linkTo, Ice.Current current);
-
-        public abstract LinkInfo[] getLinkInfoSeq(Ice.Current current);
-
-        public abstract global::Ice.Identity[] getSubscribers(Ice.Current current);
-
-        public abstract void destroy(Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceStorm::TopicInternal";

diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
@@ -10140,10 +10140,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<string> opString1Async(string opString1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task<string[]> opStringS1Async(string[] opStringS1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<byte, bool>> opByteBoolD1Async(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task<string[]> opStringS2Async(string[] stringS, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<byte, bool>> opByteBoolD2Async(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
@@ -10164,6 +10160,10 @@ 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<string[]> opStringS1Async(string[] opStringS1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<byte, bool>> opByteBoolD1Async(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";