diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-01-30 09:52:56 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-01-30 09:52:56 -0800 |
| commit | 0b716dddb706e3d590817d364f97407fd2513bea (patch) | |
| tree | 122472d4c8014abc7ccc1a8d4bbceedeb1cc46ca /java/test/Ice/operations/MyDerivedClassI.java | |
| parent | deprecate Java2 mapping; Java bug fixes (diff) | |
| parent | Fixed array deletes (diff) | |
| download | ice-0b716dddb706e3d590817d364f97407fd2513bea.tar.bz2 ice-0b716dddb706e3d590817d364f97407fd2513bea.tar.xz ice-0b716dddb706e3d590817d364f97407fd2513bea.zip | |
merge from master; bug fixes
Diffstat (limited to 'java/test/Ice/operations/MyDerivedClassI.java')
| -rw-r--r-- | java/test/Ice/operations/MyDerivedClassI.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java index 0e0ed9de44a..f68c4c11ac0 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/Ice/operations/MyDerivedClassI.java @@ -272,7 +272,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass return p1 + " " + p2; } - public java.util.Map + public java.util.Map<String, Test.MyEnum> opStringMyEnumD(java.util.Map p1, java.util.Map p2, Test.StringMyEnumDHolder p3, Ice.Current current) |