diff options
| -rw-r--r-- | CHANGELOG-3.6.md | 9 | ||||
| -rw-r--r-- | cpp/test/Ice/operations/Test.ice | 15 | ||||
| -rw-r--r-- | csharp/test/Ice/operations/Test.ice | 15 | ||||
| -rw-r--r-- | java/test/src/main/java/test/Ice/operations/Test.ice | 15 | ||||
| -rw-r--r-- | js/test/Ice/operations/Test.ice | 15 | ||||
| -rw-r--r-- | objective-c/test/Ice/operations/OperationsTest.ice | 15 | ||||
| -rw-r--r-- | php/test/Ice/operations/Test.ice | 15 | ||||
| -rw-r--r-- | python/test/Ice/operations/Test.ice | 15 | ||||
| -rw-r--r-- | ruby/test/Ice/operations/Test.ice | 15 |
9 files changed, 129 insertions, 0 deletions
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md index f770a4b31c6..802e4ba2d41 100644 --- a/CHANGELOG-3.6.md +++ b/CHANGELOG-3.6.md @@ -11,6 +11,9 @@ particular aspect of Ice. - [Changes in Ice 3.6.4](#changes-in-ice-364) - [General Changes](#general-changes) - [C++ Changes](#c-changes) + - [Java Changes](#java-changes) + - [JavaScript Changes](#javascript-changes) + - [C# Changes](#c-changes-2) - [Changes in Ice 3.6.3](#changes-in-ice-363) - [General Changes](#general-changes) - [C++ Changes](#c-changes) @@ -63,6 +66,12 @@ These are the changes since Ice 3.6.4. - Fixed bug which would cause an IceUtil::NullHandleException to be raised when using a proxy configured with ice_invocationTimeout(-2) with collocated calls. +## Java Changes + +- Fixed generated code bug which would cause a build failure if an interface + inherited from an interface from another module and if this interface had + operations returning multiple values. + ## JavaScript Changes - Fixed a bug in Ice.Long toNumber implementation where negative integers 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 +{ +}; + +}; diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index 0b9c2cb22cf..ec9caea18ee 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -353,3 +353,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +}; diff --git a/java/test/src/main/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice index 597b3af8a2d..808bf5bc31f 100644 --- a/java/test/src/main/java/test/Ice/operations/Test.ice +++ b/java/test/src/main/java/test/Ice/operations/Test.ice @@ -352,3 +352,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +};
\ No newline at end of file diff --git a/js/test/Ice/operations/Test.ice b/js/test/Ice/operations/Test.ice index b08be6d7f9d..2401d6a01ca 100644 --- a/js/test/Ice/operations/Test.ice +++ b/js/test/Ice/operations/Test.ice @@ -356,3 +356,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +}; diff --git a/objective-c/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice index f74374c28b0..0fcf8287eee 100644 --- a/objective-c/test/Ice/operations/OperationsTest.ice +++ b/objective-c/test/Ice/operations/OperationsTest.ice @@ -396,3 +396,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +}; diff --git a/php/test/Ice/operations/Test.ice b/php/test/Ice/operations/Test.ice index 3da80e8a635..70392c2445a 100644 --- a/php/test/Ice/operations/Test.ice +++ b/php/test/Ice/operations/Test.ice @@ -329,3 +329,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +}; diff --git a/python/test/Ice/operations/Test.ice b/python/test/Ice/operations/Test.ice index dfb978df5d3..bf5fc4655d6 100644 --- a/python/test/Ice/operations/Test.ice +++ b/python/test/Ice/operations/Test.ice @@ -350,3 +350,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +}; diff --git a/ruby/test/Ice/operations/Test.ice b/ruby/test/Ice/operations/Test.ice index 000034996db..0038038d332 100644 --- a/ruby/test/Ice/operations/Test.ice +++ b/ruby/test/Ice/operations/Test.ice @@ -348,3 +348,18 @@ const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198 const string su2 = "\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 +{ +}; + +};
\ No newline at end of file |