summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Gen.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-02-01 17:16:04 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-02-01 17:16:04 +0100
commit46bfaab25c7c52112babf9321fcb8954f34f4010 (patch)
tree32fa30091ae0c61a5731dc026877744763c210e3 /cpp/src/slice2java/Gen.cpp
parentFixed JS proxy test failure (diff)
downloadice-46bfaab25c7c52112babf9321fcb8954f34f4010.tar.bz2
ice-46bfaab25c7c52112babf9321fcb8954f34f4010.tar.xz
ice-46bfaab25c7c52112babf9321fcb8954f34f4010.zip
Added ice_fixed to generated Java proxy class, added test to check proxy return type from ice_fixed
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
-rw-r--r--cpp/src/slice2java/Gen.cpp12
1 files changed, 12 insertions, 0 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() << "\";";