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/slice2cpp/Gen.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/slice2cpp/Gen.cpp')
| -rwxr-xr-x | cpp/src/slice2cpp/Gen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index d8dcf403ef7..bb88118354c 100755 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -19,6 +19,7 @@ using namespace std; using namespace Slice; using namespace IceUtil; +using namespace IceUtilInternal; static string getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2) @@ -375,7 +376,7 @@ Slice::Gen::generate(const UnitPtr& p) } void -Slice::Gen::writeExtraHeaders(IceUtil::Output& out) +Slice::Gen::writeExtraHeaders(IceUtilInternal::Output& out) { for(vector<string>::const_iterator i = _extraHeaders.begin(); i != _extraHeaders.end(); ++i) { @@ -3370,7 +3371,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) StringList::const_iterator firstIter = ids.begin(); StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped()); assert(scopedIter != ids.end()); - StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter); + StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter); H << sp; H << nl << "virtual bool ice_isA" |