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/slice2java/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/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index d802e9388b0..6990c90618c 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -11,7 +11,6 @@ #include <Gen.h> #include <Slice/Checksum.h> #include <IceUtil/Functional.h> -#include <IceUtil/Algorithm.h> #include <IceUtil/Iterator.h> #include <limits> @@ -24,13 +23,13 @@ using namespace Slice; // about ambigious symbols for constructs like // "IceUtil::constMemFun(&Slice::Exception::isLocal)". // -using IceUtil::Output; -using IceUtil::nl; -using IceUtil::sp; -using IceUtil::sb; -using IceUtil::eb; -using IceUtil::spar; -using IceUtil::epar; +using IceUtilInternal::Output; +using IceUtilInternal::nl; +using IceUtilInternal::sp; +using IceUtilInternal::sb; +using IceUtilInternal::eb; +using IceUtilInternal::spar; +using IceUtilInternal::epar; static string sliceModeToIceMode(Operation::Mode opMode) @@ -398,7 +397,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr& StringList::const_iterator firstIter = ids.begin(); StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped); assert(scopedIter != ids.end()); - StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter); + StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter); out << sp << nl << "public static final String[] __ids ="; out << sb; |