diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
| commit | 08ec7524df324e627bbb8d93c509f0d90badbe3b (patch) | |
| tree | a640ae99a5e35b210352150feef4f71832b265c5 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.bz2 ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.xz ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.zip | |
IceUtil cleanup (first commit)
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 03e1a85bc18..8b495c53f0c 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Slice; using namespace IceUtil; +using namespace IceUtilInternal; Slice::FeatureProfile Slice::featureProfile = Slice::Ice; @@ -778,7 +779,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& { seqType = fixKwd(seq->scoped()); } - out << nl << stream << deref << "writeSize(static_cast< ::Ice::Int>(ice_distance(" + out << nl << stream << deref << "writeSize(static_cast< ::Ice::Int>(IceUtilInternal::distance(" << fixedParam << ".first, " << fixedParam << ".second)));"; out << nl << "for(" << seqType << "::const_iterator ___" << fixedParam << " = " << fixedParam << ".first; ___" << fixedParam << " != " << fixedParam << ".second; ++___" @@ -879,7 +880,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& { s = " " + s; } - out << nl << "::IceUtil::ScopedArray<" << s << "> ___" << fixedParam << '(' + out << nl << "::IceUtilInternal::ScopedArray<" << s << "> ___" << fixedParam << '(' << stream << deref << func << fixedParam << "));"; } else |