diff options
| author | Michi Henning <michi@zeroc.com> | 2004-10-28 06:02:14 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-10-28 06:02:14 +0000 |
| commit | 1ef7107b9f68f29fb5c28fcaa96983e5edaef8bc (patch) | |
| tree | 9666c32fde0190a9eca12fd3045c884cf7718a19 /cpp/src/slice2cs | |
| parent | changing version to 2.0.0 (diff) | |
| download | ice-1ef7107b9f68f29fb5c28fcaa96983e5edaef8bc.tar.bz2 ice-1ef7107b9f68f29fb5c28fcaa96983e5edaef8bc.tar.xz ice-1ef7107b9f68f29fb5c28fcaa96983e5edaef8bc.zip | |
Fixed bugs in code generation for nested sequences.
Diffstat (limited to 'cpp/src/slice2cs')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index b2554371d41..57bce9d9dfb 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -1382,7 +1382,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p) _out << sp << nl << "public " << s << "[] ToArray()"; _out << sb; - _out << nl << s << "[] __a = new " << s << "[InnerList.Count];"; + _out << nl << s << "[] __a = new " << toArrayAlloc(s + "[]", "InnerList.Count") << ';'; _out << nl << "InnerList.CopyTo(__a, 0);"; _out << nl << "return __a;"; _out << eb; @@ -3014,7 +3014,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p) _out << sb; string keyArg = "((" + keyS + ")__e.Key)"; writeMarshalUnmarshalCode(_out, key, keyArg, true, false); - string valueArg = "(" + valueS + ")__e.Value"; + string valueArg = "((" + valueS + ")__e.Value)"; writeMarshalUnmarshalCode(_out, value, valueArg, true, false); _out << eb; _out << eb; |