summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/CPlusPlusUtil.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2006-06-19 06:15:55 +0000
committerMichi Henning <michi@zeroc.com>2006-06-19 06:15:55 +0000
commit864a47f6128a191f53e56bafb0ea5f6d7d560248 (patch)
tree121cb7f800eb05ffdcf8082c7fdc8676eb27684d /cpp/src/Slice/CPlusPlusUtil.cpp
parentadding CA scripts (diff)
downloadice-864a47f6128a191f53e56bafb0ea5f6d7d560248.tar.bz2
ice-864a47f6128a191f53e56bafb0ea5f6d7d560248.tar.xz
ice-864a47f6128a191f53e56bafb0ea5f6d7d560248.zip
Fixed code generation bug for array mapping for sequences.
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 61bfef813bd..7eda347454b 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -610,7 +610,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
if(seqType == "array" || seqType == "range:array")
{
//
- // Use array (pair<const TYPE*, const TYPE*>). In paramters only.
+ // Use array (pair<const TYPE*, const TYPE*>). In parameters only.
//
if(!builtin || builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindObjectProxy)
{
@@ -743,7 +743,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
if(seqType.empty())
{
out << nl << typeToString(type, false) << " ___" << fixedParam << ";";
- out << nl << scope << "___" << func << (pointer ? "" : "&") << stream << ", ___"
+ out << nl << scope << "__" << func << (pointer ? "" : "&") << stream << ", ___"
<< fixedParam << ", " << scope << "__U__" << fixKwd(seq->name()) << "());";
}
else