From a87419f1304aa63b0b4e17f750f5dd2097cb8bf4 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Wed, 16 Jun 2010 01:21:33 +0000
Subject: Remove some of the more extraneous namespaces

---
 src/codec/openpgp/openpgp.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/codec/openpgp/openpgp.cpp')

diff --git a/src/codec/openpgp/openpgp.cpp b/src/codec/openpgp/openpgp.cpp
index f55caf1c8..ca1ea6d9c 100644
--- a/src/codec/openpgp/openpgp.cpp
+++ b/src/codec/openpgp/openpgp.cpp
@@ -13,14 +13,13 @@
 
 namespace Botan {
 
-namespace OpenPGP {
-
 /*
 * OpenPGP Base64 encoding
 */
-std::string encode(const byte input[], u32bit length,
-                   const std::string& label,
-                   const std::map<std::string, std::string>& headers)
+std::string PGP_encode(
+   const byte input[], u32bit length,
+   const std::string& label,
+   const std::map<std::string, std::string>& headers)
    {
    const std::string PGP_HEADER = "-----BEGIN PGP " + label + "-----\n";
    const std::string PGP_TRAILER = "-----END PGP " + label + "-----\n";
@@ -58,18 +57,19 @@ std::string encode(const byte input[], u32bit length,
 /*
 * OpenPGP Base64 encoding
 */
-std::string encode(const byte input[], u32bit length,
-                   const std::string& type)
+std::string PGP_encode(const byte input[], u32bit length,
+                       const std::string& type)
    {
    std::map<std::string, std::string> empty;
-   return encode(input, length, type, empty);
+   return PGP_encode(input, length, type, empty);
    }
 
 /*
 * OpenPGP Base64 decoding
 */
-SecureVector<byte> decode(DataSource& source, std::string& label,
-                          std::map<std::string, std::string>& headers)
+SecureVector<byte> PGP_decode(DataSource& source,
+                              std::string& label,
+                              std::map<std::string, std::string>& headers)
    {
    const u32bit RANDOM_CHAR_LIMIT = 5;
 
@@ -186,13 +186,11 @@ SecureVector<byte> decode(DataSource& source, std::string& label,
 /*
 * OpenPGP Base64 decoding
 */
-SecureVector<byte> decode(DataSource& source, std::string& label)
+SecureVector<byte> PGP_decode(DataSource& source, std::string& label)
    {
    std::map<std::string, std::string> ignored;
-   return decode(source, label, ignored);
+   return PGP_decode(source, label, ignored);
    }
 
 }
 
-}
-
-- 
cgit v1.2.3