fixes

2 files changed, 5 insertions, 8 deletions

diff --git a/cpp/include/IceUtil/Base64.h b/cpp/include/IceUtil/Base64.h
index 272cc2002dc..a4563e4cb8e 100644
--- a/cpp/include/IceUtil/Base64.h
+++ b/cpp/include/IceUtil/Base64.h
@@ -18,15 +18,12 @@
 namespace IceUtil
 {
 
-// Defined here to avoid using Ice::ByteSeq
-typedef std::vector<char> ICE_UTIL_API ByteSeq;
-
 class ICE_UTIL_API Base64
 {
 public:
 
-    static std::string encode(const ByteSeq&);
-    static ByteSeq decode(const std::string&);
+    static std::string encode(const std::vector<char>&);
+    static std::vector<char> decode(const std::string&);
 
 
 private:
diff --git a/cpp/src/IceUtil/Base64.cpp b/cpp/src/IceUtil/Base64.cpp
index e3036f94ba0..00ef4d55a68 100644
--- a/cpp/src/IceUtil/Base64.cpp
+++ b/cpp/src/IceUtil/Base64.cpp
@@ -14,7 +14,7 @@
 using namespace std;
 
 string
-IceUtil::Base64::encode(const ByteSeq& plainSeq)
+IceUtil::Base64::encode(const vector<char>& plainSeq)
 {
     string retval;
 
@@ -97,7 +97,7 @@ IceUtil::Base64::encode(const ByteSeq& plainSeq)
     return outString;
 }
 
-IceUtil::ByteSeq
+vector<char>
 IceUtil::Base64::decode(const string& str)
 {
     string newStr;
@@ -112,7 +112,7 @@ IceUtil::Base64::decode(const string& str)
         }
     }
 
-    ByteSeq retval;
+    vector<char> retval;
 
     if(newStr.length() == 0)
     {