summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/src/slice2java/Gen.cpp12
-rw-r--r--cpp/test/Ice/proxy/AllTests.cpp3
-rw-r--r--csharp/test/Ice/proxy/AllTests.cs3
-rw-r--r--java-compat/test/src/main/java/test/Ice/proxy/AllTests.java3
-rw-r--r--java/test/src/main/java/test/Ice/proxy/AllTests.java3
-rw-r--r--js/test/Ice/proxy/Client.js2
-rw-r--r--objective-c/test/Ice/proxy/AllTests.m2
-rw-r--r--php/test/Ice/proxy/Client.php2
-rw-r--r--python/test/Ice/proxy/AllTests.py2
-rw-r--r--ruby/test/Ice/proxy/AllTests.rb2
10 files changed, 25 insertions, 9 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 01d3e752ccb..d6039c28691 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -4852,6 +4852,18 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
out << eb;
out << sp;
+ writeDocComment(out,
+ "Returns a proxy that is identical to this proxy, except it's a fixed proxy bound\n"
+ "the given connection."
+ "@param connection The fixed proxy connection.\n"
+ "@return A fixed proxy bound to the given connection.");
+ out << nl << "@Override";
+ out << nl << "default " << p->name() << "Prx ice_fixed(com.zeroc.Ice.Connection connection)";
+ out << sb;
+ out << nl << "return (" << p->name() << "Prx)_ice_fixed(connection);";
+ out << eb;
+
+ out << sp;
out << nl << "static String ice_staticId()";
out << sb;
out << nl << "return \"" << p->scoped() << "\";";
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 9a23982ccc0..f3f09e9b9d4 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -1151,7 +1151,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
Ice::ConnectionPtr connection = cl->ice_getConnection();
if(connection)
{
- cl->ice_fixed(connection)->ice_ping();
+ Test::MyClassPrxPtr prx = cl->ice_fixed(connection); // Test factory method return type
+ prx->ice_ping();
test(cl->ice_secure(true)->ice_fixed(connection)->ice_isSecure());
test(cl->ice_facet("facet")->ice_fixed(connection)->ice_getFacet() == "facet");
test(cl->ice_oneway()->ice_fixed(connection)->ice_isOneway());
diff --git a/csharp/test/Ice/proxy/AllTests.cs b/csharp/test/Ice/proxy/AllTests.cs
index 9d1d0e51914..456004f8f6a 100644
--- a/csharp/test/Ice/proxy/AllTests.cs
+++ b/csharp/test/Ice/proxy/AllTests.cs
@@ -815,7 +815,8 @@ public class AllTests : TestCommon.AllTests
Ice.Connection connection = cl.ice_getConnection();
if(connection != null)
{
- cl.ice_fixed(connection).ice_ping();
+ Test.MyClassPrx prx = (Test.MyClassPrx)cl.ice_fixed(connection);
+ prx.ice_ping();
test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet().Equals("facet"));
test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
diff --git a/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java b/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java
index 1d27c907644..a4c17e37366 100644
--- a/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java
@@ -903,7 +903,8 @@ public class AllTests
Ice.Connection connection = cl.ice_getConnection();
if(connection != null)
{
- cl.ice_fixed(connection).ice_ping();
+ MyClassPrx prx = (MyClassPrx)cl.ice_fixed(connection); // Test proxy return type.
+ prx.ice_ping();
test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet().equals("facet"));
test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
diff --git a/java/test/src/main/java/test/Ice/proxy/AllTests.java b/java/test/src/main/java/test/Ice/proxy/AllTests.java
index 9132eaf514e..d156e63cace 100644
--- a/java/test/src/main/java/test/Ice/proxy/AllTests.java
+++ b/java/test/src/main/java/test/Ice/proxy/AllTests.java
@@ -840,7 +840,8 @@ public class AllTests
com.zeroc.Ice.Connection connection = cl.ice_getConnection();
if(connection != null)
{
- cl.ice_fixed(connection).ice_ping();
+ MyClassPrx prx = cl.ice_fixed(connection); // Test proxy return type.
+ prx.ice_ping();
test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet().equals("facet"));
test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js
index 8169422df3e..40be553ebd2 100644
--- a/js/test/Ice/proxy/Client.js
+++ b/js/test/Ice/proxy/Client.js
@@ -773,7 +773,7 @@
const connection = await cl.ice_getConnection();
if(connection != null)
{
- await cl.ice_fixed(connection).ice_ping();
+ await cl.ice_fixed(connection).getContext();
test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet");
test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
diff --git a/objective-c/test/Ice/proxy/AllTests.m b/objective-c/test/Ice/proxy/AllTests.m
index 886bbbab0da..aee5e5adf15 100644
--- a/objective-c/test/Ice/proxy/AllTests.m
+++ b/objective-c/test/Ice/proxy/AllTests.m
@@ -719,7 +719,7 @@ proxyAllTests(id<ICECommunicator> communicator)
id<ICEConnection> connection = [cl ice_getConnection];
if(connection != nil)
{
- [[cl ice_fixed:connection] ice_ping];
+ [[cl ice_fixed:connection] getContext];
test([[[cl ice_secure:YES] ice_fixed:connection] ice_isSecure]);
test([[[[cl ice_facet:@"facet"] ice_fixed:connection] ice_getFacet] isEqualToString:@"facet"]);
test([[[cl ice_oneway] ice_fixed:connection] ice_isOneway]);
diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php
index a4210d0ff10..2cd5922ed1a 100644
--- a/php/test/Ice/proxy/Client.php
+++ b/php/test/Ice/proxy/Client.php
@@ -533,7 +533,7 @@ function allTests($communicator)
$connection = $cl->ice_getConnection();
if($connection != null)
{
- $cl->ice_fixed($connection)->ice_ping();
+ $cl->ice_fixed($connection)->getContext();
test($cl->ice_secure(true)->ice_fixed($connection)->ice_isSecure());
test($cl->ice_facet("facet")->ice_fixed($connection)->ice_getFacet() == "facet");
test($cl->ice_oneway()->ice_fixed($connection)->ice_isOneway());
diff --git a/python/test/Ice/proxy/AllTests.py b/python/test/Ice/proxy/AllTests.py
index 1dd076debfe..0af0437af71 100644
--- a/python/test/Ice/proxy/AllTests.py
+++ b/python/test/Ice/proxy/AllTests.py
@@ -659,7 +659,7 @@ def allTests(communicator, collocated):
sys.stdout.flush()
connection = cl.ice_getConnection()
if connection != None:
- cl.ice_fixed(connection).ice_ping()
+ cl.ice_fixed(connection).getContext()
test(cl.ice_secure(True).ice_fixed(connection).ice_isSecure())
test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet")
test(cl.ice_oneway().ice_fixed(connection).ice_isOneway())
diff --git a/ruby/test/Ice/proxy/AllTests.rb b/ruby/test/Ice/proxy/AllTests.rb
index b00156f372c..31e50be0bff 100644
--- a/ruby/test/Ice/proxy/AllTests.rb
+++ b/ruby/test/Ice/proxy/AllTests.rb
@@ -656,7 +656,7 @@ def allTests(communicator)
STDOUT.flush
connection = cl.ice_getConnection()
if connection != nil
- cl.ice_fixed(connection).ice_ping()
+ cl.ice_fixed(connection).getContext()
test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure())
test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet")
test(cl.ice_oneway().ice_fixed(connection).ice_isOneway())
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:22:33 +0000