diff options
| author | Michi Henning <michi@zeroc.com> | 2002-07-23 03:30:26 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-07-23 03:30:26 +0000 |
| commit | df8e6d92d39f60fdec3a40ec78028e7b68389eb7 (patch) | |
| tree | b69be355d24f225c3cc4b5b2a49b75ddd886ba9f /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Fix (diff) | |
| download | ice-df8e6d92d39f60fdec3a40ec78028e7b68389eb7.tar.bz2 ice-df8e6d92d39f60fdec3a40ec78028e7b68389eb7.tar.xz ice-df8e6d92d39f60fdec3a40ec78028e7b68389eb7.zip | |
Fixed remaining bugs for escaped keywords in C++ code generation. The
torture test IDL compiles correctly now.
Removed a few commented-out sections of code that I left behind earlier.
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 5d1c95ec4a9..aab278a1bbc 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -464,7 +464,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& { string scope = fixKwd(seq->scope()); out << nl << scope << "__" << func << (pointer ? "" : "&") << stream << ", " - << fixedParam << ", " << scope << "__U__" << seq->name() << "());"; + << fixedParam << ", " << scope << "__U__" << fixKwd(seq->name()) << "());"; } return; } @@ -474,7 +474,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& { string scope = fixKwd(dict->scope()); out << nl << scope << "__" << func << (pointer ? "" : "&") << stream << ", " - << fixedParam << ", " << scope << "__U__" << dict->name() << "());"; + << fixedParam << ", " << scope << "__U__" << fixKwd(dict->name()) << "());"; return; } @@ -693,7 +693,7 @@ Slice::writeGenericMarshalUnmarshalCode(Output& out, const TypePtr& type, const { string scope = fixKwd(seq->scope()); out << nl << scope << genFunc << tagName << ", " << (pointer ? "" : "&") << stream - << ", " << fixedParam << ", " << scope << "__U__" << seq->name() << "());"; + << ", " << fixedParam << ", " << scope << "__U__" << fixKwd(seq->name()) << "());"; } return; } @@ -703,7 +703,7 @@ Slice::writeGenericMarshalUnmarshalCode(Output& out, const TypePtr& type, const { string scope = fixKwd(dict->scope()); out << nl << scope << genFunc << tagName << ", " << (pointer ? "" : "&") << stream - << ", " << fixedParam << ", " << scope << "__U__" << dict->name() << "());"; + << ", " << fixedParam << ", " << scope << "__U__" << fixKwd(dict->name()) << "());"; return; } |