Skip to content

Commit

Permalink
HEAD:(zeroc-ice/ice@ed1d37098e) Improve JavaScript doc comments for g…
Browse files Browse the repository at this point in the history 
…enerated code (zeroc-ice/ice#2604)
  • Loading branch information
@pepone
pepone authored and temp committed Aug 2, 2024
1 parent 053ede2 commit 52783d7
Show file tree
Hide file tree
Showing 1,496 changed files with 2,044 additions and 2,044 deletions.
12 changes: 6 additions & 6 deletions slice2cpp/cpp/src/IceGrid/Internal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<
{
ex.ice_throw();
}
catch(const AdapterExistsException&)
catch(const AdapterNotExistException&)
{
throw;
}
catch(const AdapterNotExistException&)
catch(const AdapterExistsException&)
{
throw;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions slice2cpp/slice/Glacier2/Router.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
40 changes: 20 additions & 20 deletions slice2cs/cpp/src/IceGrid/Internal.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5792,11 +5792,11 @@ private void _iceI_setDatabaseObserver(DatabaseObserverPrx? iceP_dbObs, global::
{
throw ex;
}
catch(ObserverAlreadyRegisteredException)
catch(DeploymentException)
{
throw;
}
catch(DeploymentException)
catch(ObserverAlreadyRegisteredException)
{
throw;
}
Expand Down Expand Up @@ -6305,11 +6305,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
{
throw ex;
}
catch(PermissionDeniedException)
catch(NodeActiveException)
{
throw;
}
catch(NodeActiveException)
catch(PermissionDeniedException)
{
throw;
}
Expand Down Expand Up @@ -6361,11 +6361,11 @@ private void _iceI_registerReplica(InternalReplicaInfo? iceP_info, InternalRegis
{
throw ex;
}
catch(PermissionDeniedException)
catch(ReplicaActiveException)
{
throw;
}
catch(ReplicaActiveException)
catch(PermissionDeniedException)
{
throw;
}
Expand Down Expand Up @@ -6728,10 +6728,10 @@ public abstract class ServerDisp_ : Ice.ObjectImpl, Server

public abstract global::System.Threading.Tasks.Task setProcessAsync(global::Ice.ProcessPrx? proc, 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 long getOffsetFromEnd(string filename, int lines, Ice.Current current);

public override string ice_id(Ice.Current current) => ice_staticId();

public static new string ice_staticId() => "::IceGrid::Server";
Expand Down Expand Up @@ -6811,8 +6811,6 @@ 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);
Expand All @@ -6821,6 +6819,8 @@ public abstract class NodeDisp_ : Ice.ObjectImpl, Node

public abstract void replicaRemoved(InternalRegistryPrx? replica, Ice.Current current);

public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);

public override string ice_id(Ice.Current current) => ice_staticId();

public static new string ice_staticId() => "::IceGrid::Node";
Expand Down Expand Up @@ -6898,14 +6898,6 @@ public abstract class NodeSessionDisp_ : Ice.ObjectImpl, NodeSession
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")]
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);

public abstract void applicationUpdated(int serial, ApplicationUpdateInfo desc, Ice.Current current);

public abstract void adapterInit(AdapterInfo[] adpts, Ice.Current current);

public abstract void adapterAdded(AdapterInfo info, Ice.Current current);
Expand All @@ -6922,6 +6914,14 @@ public abstract class DatabaseObserverDisp_ : Ice.ObjectImpl, DatabaseObserver

public abstract void objectRemoved(global::Ice.Identity id, Ice.Current current);

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);

public abstract void applicationUpdated(int serial, ApplicationUpdateInfo desc, Ice.Current current);

public override string ice_id(Ice.Current current) => ice_staticId();

public static new string ice_staticId() => "::IceGrid::DatabaseObserver";
Expand Down Expand Up @@ -7014,10 +7014,10 @@ public abstract class InternalRegistryDisp_ : Ice.ObjectImpl, InternalRegistry

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 long getOffsetFromEnd(string filename, int lines, Ice.Current current);

public override string ice_id(Ice.Current current) => ice_staticId();

public static new string ice_staticId() => "::IceGrid::InternalRegistry";
Expand Down
4 changes: 2 additions & 2 deletions slice2cs/cpp/test/Ice/facets/Test.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1665,10 +1665,10 @@ public abstract class HDisp_ : Ice.ObjectImpl, H
{
public abstract string callH(Ice.Current current);

public abstract void shutdown(Ice.Current current);

public abstract string callG(Ice.Current current);

public abstract void shutdown(Ice.Current current);

public override string ice_id(Ice.Current current) => ice_staticId();

public static new string ice_staticId() => "::Test::H";
Expand Down
16 changes: 8 additions & 8 deletions slice2cs/cpp/test/Ice/operations/TestAMD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10333,14 +10333,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<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSSResult> opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSSResult> opBoolSSAsync(bool[][] p1, bool[][] p2, 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);
Expand Down Expand Up @@ -10369,6 +10361,14 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass

public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSSResult> opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSSResult> opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSSResult> opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSSResult> opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current);
Expand Down
Loading

0 comments on commit 52783d7

Please sign in to comment.