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/slice2cppe/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/slice2cppe/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index d076c126124..9146edd8111 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -18,6 +18,7 @@ using namespace std; using namespace Slice; using namespace IceUtil; +using namespace IceUtilInternal; static void getIds(const ClassDefPtr& p, StringList& ids) @@ -1386,7 +1387,7 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(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); C << sp; C << nl << "const ::std::string&" << nl << "IceProxy" << scoped << "::ice_staticId()"; @@ -1890,7 +1891,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); StringList::const_iterator q1; |