Skip to content

Commit

Permalink
HEAD:(zeroc-ice/ice@47d5c39204) Add static C++ ci testing on Linux (z…
Browse files Browse the repository at this point in the history
  • Loading branch information
externl authored and temp committed Dec 17, 2024
1 parent 1d0119a commit 9ee50ca
Show file tree
Hide file tree
Showing 1,491 changed files with 2,307 additions and 2,307 deletions.
4 changes: 2 additions & 2 deletions slice2cpp/cpp/src/IceGrid/Internal.cpp
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
4 changes: 2 additions & 2 deletions slice2cs/cpp/test/Ice/facets/Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1421,12 +1421,12 @@ public abstract class DDisp_ : Ice.ObjectImpl, D
{
public abstract string callD(Ice.Current current);

public abstract string callC(Ice.Current current);

public abstract string callA(Ice.Current current);

public abstract string callB(Ice.Current current);

public abstract string callC(Ice.Current current);

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

public static new string ice_staticId() => "::Test::D";
Expand Down
232 changes: 116 additions & 116 deletions slice2cs/cpp/test/Ice/operations/Test.cs

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions slice2cs/cpp/test/Ice/operations/TestAMD.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10024,22 +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<MyClass_OpStringDoubleSDResult> opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringSDResult> opStringStringSDAsync(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumMyEnumSDResult> opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<int[]> opIntSAsync(int[] s, Ice.Current current);

public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<int> opByteSOnewayCallCountAsync(Ice.Current current);

public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<string, string>> opContextAsync(Ice.Current current);

public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current);

public abstract global::System.Threading.Tasks.Task<byte> opByte1Async(byte opByte1, Ice.Current current);
Expand Down Expand Up @@ -10080,10 +10064,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<bool> supportsCompressAsync(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);
Expand Down Expand Up @@ -10164,6 +10148,22 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass

public abstract global::System.Threading.Tasks.Task<MyClass_OpStringFloatSDResult> opStringFloatSDAsync(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpStringDoubleSDResult> opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringSDResult> opStringStringSDAsync(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumMyEnumSDResult> opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<int[]> opIntSAsync(int[] s, Ice.Current current);

public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current);

public abstract global::System.Threading.Tasks.Task<int> opByteSOnewayCallCountAsync(Ice.Current current);

public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<string, string>> opContextAsync(Ice.Current current);

public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current);

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

public static new string ice_staticId() => "::Test::MyDerivedClass";
Expand Down
Loading

0 comments on commit 9ee50ca

Please sign in to comment.