HEAD:(zeroc-ice/ice@0f177b11b3) Remove f ice (zeroc-ice/ice#1686)

InsertCreativityHere · Jan 18, 2024 · d3d6b8b · d3d6b8b
1 parent 54b2479
commit d3d6b8b
Show file tree

Hide file tree

Showing 1,953 changed files with 2,817 additions and 3,482 deletions.
diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp
@@ -3053,11 +3053,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setDatabaseObserver(const ::std::shared_ptr<::
             {
                 ex.ice_throw();
             }
-            catch(const DeploymentException&)
+            catch(const ObserverAlreadyRegisteredException&)
             {
                 throw;
             }
-            catch(const ObserverAlreadyRegisteredException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -3179,11 +3179,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const PermissionDeniedException&)
+            catch(const NodeActiveException&)
             {
                 throw;
             }
-            catch(const NodeActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
@@ -3211,11 +3211,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
             {
                 ex.ice_throw();
             }
-            catch(const PermissionDeniedException&)
+            catch(const ReplicaActiveException&)
             {
                 throw;
             }
-            catch(const ReplicaActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
@@ -5775,11 +5775,11 @@ IceProxy::IceGrid::ReplicaSession::end_setDatabaseObserver(const ::Ice::AsyncRes
         {
             result->_throwUserException();
         }
-        catch(const ::IceGrid::DeploymentException&)
+        catch(const ::IceGrid::ObserverAlreadyRegisteredException&)
         {
             throw;
         }
-        catch(const ::IceGrid::ObserverAlreadyRegisteredException&)
+        catch(const ::IceGrid::DeploymentException&)
         {
             throw;
         }
@@ -6007,11 +6007,11 @@ IceProxy::IceGrid::InternalRegistry::end_registerNode(const ::Ice::AsyncResultPt
         {
             result->_throwUserException();
         }
-        catch(const ::IceGrid::PermissionDeniedException&)
+        catch(const ::IceGrid::NodeActiveException&)
         {
             throw;
         }
-        catch(const ::IceGrid::NodeActiveException&)
+        catch(const ::IceGrid::PermissionDeniedException&)
         {
             throw;
         }
@@ -6059,11 +6059,11 @@ IceProxy::IceGrid::InternalRegistry::end_registerReplica(const ::Ice::AsyncResul
         {
             result->_throwUserException();
         }
-        catch(const ::IceGrid::PermissionDeniedException&)
+        catch(const ::IceGrid::ReplicaActiveException&)
         {
             throw;
         }
-        catch(const ::IceGrid::ReplicaActiveException&)
+        catch(const ::IceGrid::PermissionDeniedException&)
         {
             throw;
         }

diff --git a/slice2cpp/slice/Ice/LocatorF.cpp b/slice2cpp/slice/Ice/LocatorF.cpp
diff --git a/slice2cpp/slice/Ice/LocatorF.h b/slice2cpp/slice/Ice/LocatorF.h
diff --git a/slice2cpp/slice/Ice/RouterF.cpp b/slice2cpp/slice/Ice/RouterF.cpp