summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-03-06 18:28:01 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-03-06 18:28:01 +0100
commiteb709e9ce6fbfef643694c8a89fe1624523ee8e9 (patch)
treefa6e71d31f70db738e294fdf72cb5e957ac5f0a0 /cpp
parentDisable d2SSAOptimizer for few projects and v141 (ICE-7587) (diff)
parentReverted JS build dependencies to previous versions (diff)
downloadice-eb709e9ce6fbfef643694c8a89fe1624523ee8e9.tar.bz2
ice-eb709e9ce6fbfef643694c8a89fe1624523ee8e9.tar.xz
ice-eb709e9ce6fbfef643694c8a89fe1624523ee8e9.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/operations/Test.ice15
1 files changed, 15 insertions, 0 deletions
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index 7d4bd24d547..817cefc63a8 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/Test.ice
@@ -423,3 +423,18 @@ const ["cpp:type:wstring"]string wsu1 = "\u0128\u0178\u00FF\u0100\u1F00\U0001019
const ["cpp:type:wstring"]string wsu2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
};
+
+module Test2
+{
+
+/**
+ *
+ * Makes sure that proxy operations are correctly generated when extending an interface from
+ * a different module (ICE-7639).
+ *
+ **/
+class MyDerivedClass extends Test::MyClass
+{
+};
+
+};