Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cpp/src/Slice/VbUtil.cpp

1 files changed, 36 insertions, 0 deletions

diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h
new file mode 100644
index 00000000000..fece85491bb
--- /dev/null
+++ b/cpp/src/Ice/Base64.h
@@ -0,0 +1,36 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BASE_64_H
+#define ICE_BASE_64_H
+
+#include <Ice/Config.h>
+#include <string>
+#include <vector>
+
+namespace IceInternal
+{
+
+class Base64
+{
+public:
+
+    static std::string encode(const std::vector<unsigned char>&);
+    static std::vector<unsigned char> decode(const std::string&);
+    static bool isBase64(char);
+
+private:
+
+    static char encode(unsigned char);
+    static unsigned char decode(char);
+};
+
+}
+
+#endif