diff options
| author | Michi Henning <michi@zeroc.com> | 2004-06-23 01:18:52 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-06-23 01:18:52 +0000 |
| commit | 43a1f674c340aa9c8aa03a8008c936f507498a2b (patch) | |
| tree | dcf676c34845a380127b940722746963c6a2b690 /cpp/src/Slice/JavaUtil.cpp | |
| parent | Got rid of old UserExceptionFactory code that was still kicking around but (diff) | |
| download | ice-43a1f674c340aa9c8aa03a8008c936f507498a2b.tar.bz2 ice-43a1f674c340aa9c8aa03a8008c936f507498a2b.tar.xz ice-43a1f674c340aa9c8aa03a8008c936f507498a2b.zip | |
Fixed mapping bug for Slice operations called "checkedCast" or
"uncheckedCast". Updates to the C# mapping.
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index cc9b3072e70..8dab79562c9 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -149,19 +149,21 @@ static string lookupKwd(const string& name) { // - // Keyword list. *Must* be kept in alphabetical order. + // Keyword list. *Must* be kept in alphabetical order. Note that checkedCast and uncheckedCast + // are not Java keywords, but are in this list to prevent illegal code being generated if + // someone defines Slice operations with that name. // static const string keywordList[] = { "abstract", "assert", "boolean", "break", "byte", "case", "catch", - "char", "class", "clone", "const", "continue", "default", "do", + "char", "checkedCast", "class", "clone", "const", "continue", "default", "do", "double", "else", "equals", "extends", "false", "final", "finalize", "finally", "float", "for", "getClass", "goto", "hashCode", "if", "implements", "import", "instanceof", "int", "interface", "long", "native", "new", "notify", "notifyAll", "null", "package", "private", "protected", "public", "return", "short", "static", "strictfp", "super", "switch", "synchronized", "this", "throw", "throws", "toString", "transient", - "true", "try", "void", "volatile", "wait", "while" + "true", "try", "uncheckedCast", "void", "volatile", "wait", "while" }; bool found = binary_search(&keywordList[0], &keywordList[sizeof(keywordList) / sizeof(*keywordList)], |