From 08ec7524df324e627bbb8d93c509f0d90badbe3b Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Fri, 21 Dec 2007 11:12:14 -0500
Subject: IceUtil cleanup (first commit)

---
 cpp/src/slice2java/Gen.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'cpp/src/slice2java/Gen.cpp')

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;
-- 
cgit v1.2.3