Cleanup use of unnamed namespaces in encoders and decoders

1 files changed, 21 insertions, 24 deletions

diff --git a/base32.cpp b/base32.cpp
index f474de07..c3d32526 100644
--- a/base32.cpp
+++ b/base32.cpp
@@ -4,30 +4,11 @@
 #include "base32.h"

 

 NAMESPACE_BEGIN(CryptoPP)

-

-namespace

-{

-	const byte s_vecUpper[] = "ABCDEFGHIJKMNPQRSTUVWXYZ23456789";

-	const byte s_vecLower[] = "abcdefghijkmnpqrstuvwxyz23456789";

-}

-

-void Base32Encoder::IsolatedInitialize(const NameValuePairs &parameters)

-{

-	bool uppercase = parameters.GetValueWithDefault(Name::Uppercase(), true);

-	m_filter->Initialize(CombinedNameValuePairs(

-		parameters,

-		MakeParameters(Name::EncodingLookupArray(), uppercase ? &s_vecUpper[0] : &s_vecLower[0], false)(Name::Log2Base(), 5, true)));

-}

-

-void Base32Decoder::IsolatedInitialize(const NameValuePairs &parameters)

-{

-	BaseN_Decoder::IsolatedInitialize(CombinedNameValuePairs(

-		parameters,

-		MakeParameters(Name::DecodingLookupArray(), GetDefaultDecodingLookupArray(), false)(Name::Log2Base(), 5, true)));

-}

-

 ANONYMOUS_NAMESPACE_BEGIN

-static const int s_array[256] = {

+

+const byte s_vecUpper[] = "ABCDEFGHIJKMNPQRSTUVWXYZ23456789";

+const byte s_vecLower[] = "abcdefghijkmnpqrstuvwxyz23456789";

+const int s_array[256] = {

 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

@@ -45,7 +26,23 @@ static const int s_array[256] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1

 };

-NAMESPACE_END

+

+ANONYMOUS_NAMESPACE_END

+

+void Base32Encoder::IsolatedInitialize(const NameValuePairs &parameters)

+{

+	bool uppercase = parameters.GetValueWithDefault(Name::Uppercase(), true);

+	m_filter->Initialize(CombinedNameValuePairs(

+		parameters,

+		MakeParameters(Name::EncodingLookupArray(), uppercase ? &s_vecUpper[0] : &s_vecLower[0], false)(Name::Log2Base(), 5, true)));

+}

+

+void Base32Decoder::IsolatedInitialize(const NameValuePairs &parameters)

+{

+	BaseN_Decoder::IsolatedInitialize(CombinedNameValuePairs(

+		parameters,

+		MakeParameters(Name::DecodingLookupArray(), GetDefaultDecodingLookupArray(), false)(Name::Log2Base(), 5, true)));

+}

 

 // Unrolled initialization, http://github.com/weidai11/cryptopp/issues/376

 const int *Base32Decoder::GetDefaultDecodingLookupArray()