diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-15 18:25:33 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-15 18:25:33 +0100 |
| commit | 847b96ee887e245c2c78274769b035528784d772 (patch) | |
| tree | 9771f44d242e475ad7ef02d3d6ed0712251a7ed3 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | more INSTALL/README edits (diff) | |
| download | ice-847b96ee887e245c2c78274769b035528784d772.tar.bz2 ice-847b96ee887e245c2c78274769b035528784d772.tar.xz ice-847b96ee887e245c2c78274769b035528784d772.zip | |
Fixes for 4471 - more Ice stream fixes
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index ba658453f1a..a944eda7250 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -145,7 +145,7 @@ sequenceTypeToString(const SequencePtr& seq, const StringList& metaData, int typ { s = " " + s; } - return "::std::pair< ::IceUtilInternal::ScopedArray<" + s + ">," + + return "::std::pair< ::IceUtil::ScopedArray<" + s + ">," + " ::std::pair<const " + s + "*, const " + s + "*> >"; } else @@ -854,7 +854,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& } else { - out << nl << "::IceUtilInternal::ScopedArray<" << s << "> ___" << fixedParam << '(' + out << nl << "::IceUtil::ScopedArray<" << s << "> ___" << fixedParam << '(' << stream << deref << func << fixedParam << "));"; } } |