From 0cb1e5e337b9f9442e764ceb54ca0726c68fc043 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 3 Feb 2006 19:58:38 +0000
Subject: [PATCH] don't do namespace hack

---
 stepmania/src/crypto51/algebra.cpp  | 4 ++--
 stepmania/src/crypto51/algebra.h    | 4 ++--
 stepmania/src/crypto51/algparam.cpp | 4 ++--
 stepmania/src/crypto51/algparam.h   | 4 ++--
 stepmania/src/crypto51/argnames.h   | 4 ++--
 stepmania/src/crypto51/asn.cpp      | 4 ++--
 stepmania/src/crypto51/asn.h        | 2 +-
 stepmania/src/crypto51/config.h     | 4 ++--
 stepmania/src/crypto51/cryptlib.cpp | 4 ++--
 stepmania/src/crypto51/cryptlib.h   | 2 +-
 stepmania/src/crypto51/files.cpp    | 4 ++--
 stepmania/src/crypto51/files.h      | 4 ++--
 stepmania/src/crypto51/filters.cpp  | 4 ++--
 stepmania/src/crypto51/filters.h    | 4 ++--
 stepmania/src/crypto51/integer.cpp  | 4 ++--
 stepmania/src/crypto51/integer.h    | 6 +++---
 stepmania/src/crypto51/iterhash.cpp | 4 ++--
 stepmania/src/crypto51/iterhash.h   | 4 ++--
 stepmania/src/crypto51/misc.cpp     | 4 ++--
 stepmania/src/crypto51/misc.h       | 4 ++--
 stepmania/src/crypto51/modarith.h   | 4 ++--
 stepmania/src/crypto51/mqueue.cpp   | 4 ++--
 stepmania/src/crypto51/mqueue.h     | 6 +++---
 stepmania/src/crypto51/nbtheory.cpp | 4 ++--
 stepmania/src/crypto51/nbtheory.h   | 4 ++--
 stepmania/src/crypto51/oids.h       | 6 +++---
 stepmania/src/crypto51/osrng.cpp    | 4 ++--
 stepmania/src/crypto51/osrng.h      | 4 ++--
 stepmania/src/crypto51/pkcspad.cpp  | 4 ++--
 stepmania/src/crypto51/pkcspad.h    | 4 ++--
 stepmania/src/crypto51/pubkey.cpp   | 4 ++--
 stepmania/src/crypto51/pubkey.h     | 4 ++--
 stepmania/src/crypto51/queue.cpp    | 4 ++--
 stepmania/src/crypto51/queue.h      | 6 +++---
 stepmania/src/crypto51/rsa.cpp      | 4 ++--
 stepmania/src/crypto51/rsa.h        | 4 ++--
 stepmania/src/crypto51/secblock.h   | 6 +++---
 stepmania/src/crypto51/seckey.h     | 4 ++--
 stepmania/src/crypto51/sha.cpp      | 4 ++--
 stepmania/src/crypto51/sha.h        | 4 ++--
 stepmania/src/crypto51/simple.h     | 4 ++--
 stepmania/src/crypto51/smartptr.h   | 4 ++--
 stepmania/src/crypto51/words.h      | 4 ++--
 43 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/stepmania/src/crypto51/algebra.cpp b/stepmania/src/crypto51/algebra.cpp
index 6b20bf4761..896472b975 100644
--- a/stepmania/src/crypto51/algebra.cpp
+++ b/stepmania/src/crypto51/algebra.cpp
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 template <class T> const T& AbstractGroup<T>::Double(const Element &a) const
 {
@@ -337,4 +337,4 @@ void AbstractRing<T>::SimultaneousExponentiate(T *results, const T &base, const
 	MultiplicativeGroup().AbstractGroup<T>::SimultaneousMultiply(results, base, exponents, expCount);
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/algebra.h b/stepmania/src/crypto51/algebra.h
index d65a4d9ea4..baf46cbfb8 100644
--- a/stepmania/src/crypto51/algebra.h
+++ b/stepmania/src/crypto51/algebra.h
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 class Integer;
 
@@ -270,6 +270,6 @@ protected:
 	Element m_modulus;
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/algparam.cpp b/stepmania/src/crypto51/algparam.cpp
index 1f49db6f9c..2954eebaa1 100644
--- a/stepmania/src/crypto51/algparam.cpp
+++ b/stepmania/src/crypto51/algparam.cpp
@@ -3,8 +3,8 @@
 #include "pch.h"
 #include "algparam.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 bool (*AssignIntToInteger)(const std::type_info &valueType, void *pInteger, const void *pInt) = NULL;
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/algparam.h b/stepmania/src/crypto51/algparam.h
index 98e957bf7a..6879677940 100644
--- a/stepmania/src/crypto51/algparam.h
+++ b/stepmania/src/crypto51/algparam.h
@@ -5,7 +5,7 @@
 #include "smartptr.h"
 #include "secblock.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! used to pass byte array input as part of a NameValuePairs object
 /*! the deepCopy option is used when the NameValuePairs object can't
@@ -320,6 +320,6 @@ AlgorithmParameters<NullNameValuePairs,T> MakeParameters(const char *name, const
 #define CRYPTOPP_SET_FUNCTION_ENTRY(name)		(Name::name(), &ThisClass::Set##name)
 #define CRYPTOPP_SET_FUNCTION_ENTRY2(name1, name2)	(Name::name1(), Name::name2(), &ThisClass::Set##name1##And##name2)
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/argnames.h b/stepmania/src/crypto51/argnames.h
index ed227eedc2..8eee84aa19 100644
--- a/stepmania/src/crypto51/argnames.h
+++ b/stepmania/src/crypto51/argnames.h
@@ -3,7 +3,7 @@
 
 #include "cryptlib.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 DOCUMENTED_NAMESPACE_BEGIN(Name)
 
@@ -49,6 +49,6 @@ CRYPTOPP_DEFINE_NAME_STRING(XMACC_Counter)		//!< word32
 
 DOCUMENTED_NAMESPACE_END
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/asn.cpp b/stepmania/src/crypto51/asn.cpp
index 1a96c72e34..51c39cb8a8 100644
--- a/stepmania/src/crypto51/asn.cpp
+++ b/stepmania/src/crypto51/asn.cpp
@@ -6,7 +6,7 @@
 #include <iomanip>
 #include <time.h>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 USING_NAMESPACE(std)
 
 /// DER Length
@@ -553,4 +553,4 @@ void PKCS8PrivateKey::DEREncode(BufferedTransformation &bt) const
 	privateKeyInfo.MessageEnd();
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/asn.h b/stepmania/src/crypto51/asn.h
index 8e96d3eb93..12ea8d4aa7 100644
--- a/stepmania/src/crypto51/asn.h
+++ b/stepmania/src/crypto51/asn.h
@@ -5,7 +5,7 @@
 #include "queue.h"
 #include <vector>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 // these tags and flags are not complete
 enum ASNTag
diff --git a/stepmania/src/crypto51/config.h b/stepmania/src/crypto51/config.h
index 594dcae533..093ed63dfc 100644
--- a/stepmania/src/crypto51/config.h
+++ b/stepmania/src/crypto51/config.h
@@ -107,7 +107,7 @@
 
 typedef unsigned char byte;     // moved outside namespace for Borland C++Builder 5
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 typedef unsigned short word16;
 #if defined(__alpha) && !defined(_MSC_VER)
@@ -178,7 +178,7 @@ union dword_union
 #	define FAST_ROTATE
 #endif
 
-NAMESPACE_END
+}
 
 // VC60 workaround: it doesn't allow typename in some places
 #if defined(_MSC_VER) && (_MSC_VER < 1300)
diff --git a/stepmania/src/crypto51/cryptlib.cpp b/stepmania/src/crypto51/cryptlib.cpp
index 9d4088b2fd..7c61ef125e 100644
--- a/stepmania/src/crypto51/cryptlib.cpp
+++ b/stepmania/src/crypto51/cryptlib.cpp
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1);
 //CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4);
@@ -648,4 +648,4 @@ DecodingResult PK_Verifier::RecoverMessage(byte *recoveredMessage,
 	return RecoverAndRestart(recoveredMessage, *m);
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/cryptlib.h b/stepmania/src/crypto51/cryptlib.h
index 987ba97001..fb8a021913 100644
--- a/stepmania/src/crypto51/cryptlib.h
+++ b/stepmania/src/crypto51/cryptlib.h
@@ -62,7 +62,7 @@ and getting me started with this manual.
 #include <typeinfo>
 #include <assert.h>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 // forward declarations
 class Integer;
diff --git a/stepmania/src/crypto51/files.cpp b/stepmania/src/crypto51/files.cpp
index 4618313e7e..cb79bfbda4 100644
--- a/stepmania/src/crypto51/files.cpp
+++ b/stepmania/src/crypto51/files.cpp
@@ -3,7 +3,7 @@
 #include "pch.h"
 #include "files.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 using namespace std;
 
@@ -184,4 +184,4 @@ unsigned int FileSink::Put2(const byte *inString, unsigned int length, int messa
 	return 0;
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/files.h b/stepmania/src/crypto51/files.h
index 2c0c52d9db..98d3157522 100644
--- a/stepmania/src/crypto51/files.h
+++ b/stepmania/src/crypto51/files.h
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <fstream>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! .
 class FileStore : public Store, private FilterPutSpaceHelper
@@ -90,6 +90,6 @@ private:
 	std::ostream *m_stream;
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/filters.cpp b/stepmania/src/crypto51/filters.cpp
index 60a42a996c..ad9f1492f1 100644
--- a/stepmania/src/crypto51/filters.cpp
+++ b/stepmania/src/crypto51/filters.cpp
@@ -7,7 +7,7 @@
 #include "argnames.h"
 #include <functional>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 Filter::Filter(BufferedTransformation *attachment)
 	: m_attachment(attachment), m_continueAt(0)
@@ -605,4 +605,4 @@ unsigned int StringStore::CopyRangeTo2(BufferedTransformation &target, unsigned
 	return blockedBytes;
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/filters.h b/stepmania/src/crypto51/filters.h
index 8d57d21014..74b75d00a9 100644
--- a/stepmania/src/crypto51/filters.h
+++ b/stepmania/src/crypto51/filters.h
@@ -8,7 +8,7 @@
 #include "queue.h"
 #include "algparam.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 /// provides an implementation of BufferedTransformation's attachment interface
 class Filter : public BufferedTransformation, public NotCopyable
@@ -532,6 +532,6 @@ public:
 		: SourceTemplate<StringStore>(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string)));}
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/integer.cpp b/stepmania/src/crypto51/integer.cpp
index 1acb431149..5b93957ac6 100644
--- a/stepmania/src/crypto51/integer.cpp
+++ b/stepmania/src/crypto51/integer.cpp
@@ -20,7 +20,7 @@
 
 #include "algebra.cpp"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 bool FunctionAssignIntToInteger(const std::type_info &valueType, void *pInteger, const void *pInt)
 {
@@ -3914,4 +3914,4 @@ const Integer& MontgomeryRepresentation::MultiplicativeInverse(const Integer &a)
 
 template class AbstractRing<Integer>;    
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/integer.h b/stepmania/src/crypto51/integer.h
index 65a42456d1..ebe91dda0c 100644
--- a/stepmania/src/crypto51/integer.h
+++ b/stepmania/src/crypto51/integer.h
@@ -21,7 +21,7 @@
 #	endif
 #endif
 */
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 #ifdef SSE2_INTRINSICS_AVAILABLE
 	template <class T>
@@ -412,13 +412,13 @@ inline CryptoPP::Integer operator/(const CryptoPP::Integer &a, CryptoPP::word b)
 //!
 inline CryptoPP::word    operator%(const CryptoPP::Integer &a, CryptoPP::word b) {return a.Modulo(b);}
 
-NAMESPACE_END
+}
 
 NAMESPACE_BEGIN(std)
 template<> inline void swap(CryptoPP::Integer &a, CryptoPP::Integer &b)
 {
 	a.swap(b);
 }
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/iterhash.cpp b/stepmania/src/crypto51/iterhash.cpp
index d11baa17f8..0354e2f29c 100644
--- a/stepmania/src/crypto51/iterhash.cpp
+++ b/stepmania/src/crypto51/iterhash.cpp
@@ -4,7 +4,7 @@
 #include "iterhash.h"
 #include "misc.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 template <class T, class BASE>
 IteratedHashBase<T, BASE>::IteratedHashBase(unsigned int blockSize,
@@ -120,4 +120,4 @@ template class IteratedHashBase<word64, MessageAuthenticationCode>;
 template class IteratedHashBase<word32, HashTransformation>;
 template class IteratedHashBase<word32, MessageAuthenticationCode>;
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/iterhash.h b/stepmania/src/crypto51/iterhash.h
index 366917ef7e..a84482bcc5 100644
--- a/stepmania/src/crypto51/iterhash.h
+++ b/stepmania/src/crypto51/iterhash.h
@@ -5,7 +5,7 @@
 #include "secblock.h"
 #include "misc.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 template <class T, class BASE>
 class IteratedHashBase : public BASE
@@ -116,6 +116,6 @@ template <class T, class B, class BASE> void IteratedHashBase2<T, B, BASE>::Hash
 	}
 }
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/misc.cpp b/stepmania/src/crypto51/misc.cpp
index b5dfb15714..90b529e120 100644
--- a/stepmania/src/crypto51/misc.cpp
+++ b/stepmania/src/crypto51/misc.cpp
@@ -4,7 +4,7 @@
 #include "misc.h"
 #include "words.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 byte OAEP_P_DEFAULT[1];
 
@@ -80,4 +80,4 @@ unsigned long Crop(unsigned long value, unsigned int size)
 		return value;
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/misc.h b/stepmania/src/crypto51/misc.h
index 3e00ab5100..eb0c2af7fc 100644
--- a/stepmania/src/crypto51/misc.h
+++ b/stepmania/src/crypto51/misc.h
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #endif
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 // ************** compile-time assertion ***************
 
@@ -520,6 +520,6 @@ inline T SafeLeftShift(T value)
 	return SafeShifter<(bits>=(8*sizeof(T)))>::LeftShift(value, bits);
 }
 
-NAMESPACE_END
+}
 
 #endif // MISC_H
diff --git a/stepmania/src/crypto51/modarith.h b/stepmania/src/crypto51/modarith.h
index 7d18dd9ccb..b2627f6c1c 100644
--- a/stepmania/src/crypto51/modarith.h
+++ b/stepmania/src/crypto51/modarith.h
@@ -8,7 +8,7 @@
 #include "integer.h"
 #include "algebra.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! .
 class ModularArithmetic : public AbstractRing<Integer>
@@ -145,6 +145,6 @@ private:
 	mutable SecAlignedWordBlock workspace;
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/mqueue.cpp b/stepmania/src/crypto51/mqueue.cpp
index b24bc0752d..beb365fbf7 100644
--- a/stepmania/src/crypto51/mqueue.cpp
+++ b/stepmania/src/crypto51/mqueue.cpp
@@ -3,7 +3,7 @@
 #include "pch.h"
 #include "mqueue.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 MessageQueue::MessageQueue(unsigned int nodeSize)
 	: m_queue(nodeSize), m_lengths(1, 0U), m_messageCounts(1, 0U)
@@ -68,4 +68,4 @@ const byte * MessageQueue::Spy(unsigned int &contiguousSize) const
 
 // *************************************************************
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/mqueue.h b/stepmania/src/crypto51/mqueue.h
index eed93122d9..ab096582a5 100644
--- a/stepmania/src/crypto51/mqueue.h
+++ b/stepmania/src/crypto51/mqueue.h
@@ -5,7 +5,7 @@
 #include "filters.h"
 #include <deque>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! Message Queue
 class MessageQueue : public AutoSignaling<BufferedTransformation>
@@ -61,13 +61,13 @@ private:
 };
 
 
-NAMESPACE_END
+}
 
 NAMESPACE_BEGIN(std)
 template<> inline void swap(CryptoPP::MessageQueue &a, CryptoPP::MessageQueue &b)
 {
 	a.swap(b);
 }
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/nbtheory.cpp b/stepmania/src/crypto51/nbtheory.cpp
index 9eb0e1da46..5b194ff40e 100644
--- a/stepmania/src/crypto51/nbtheory.cpp
+++ b/stepmania/src/crypto51/nbtheory.cpp
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <vector>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 const unsigned int maxPrimeTableSize = 3511;	// last prime 32719
 const word lastSmallPrime = 32719;
@@ -730,4 +730,4 @@ unsigned int DiscreteLogWorkFactor(unsigned int n)
 }
 
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/nbtheory.h b/stepmania/src/crypto51/nbtheory.h
index 52ae6e89f9..2dc10fad99 100644
--- a/stepmania/src/crypto51/nbtheory.h
+++ b/stepmania/src/crypto51/nbtheory.h
@@ -6,7 +6,7 @@
 #include "integer.h"
 #include "algparam.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 // export a table of small primes
 extern const unsigned int maxPrimeTableSize;
@@ -104,6 +104,6 @@ bool SolveModularQuadraticEquation(Integer &r1, Integer &r2, const Integer &a, c
 unsigned int DiscreteLogWorkFactor(unsigned int bitlength);
 unsigned int FactoringWorkFactor(unsigned int bitlength);
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/oids.h b/stepmania/src/crypto51/oids.h
index fe00a9cb15..9787c41e93 100644
--- a/stepmania/src/crypto51/oids.h
+++ b/stepmania/src/crypto51/oids.h
@@ -5,7 +5,7 @@
 
 #include "asn.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 NAMESPACE_BEGIN(ASN1)
 
@@ -105,8 +105,8 @@ DEFINE_OID(2, joint_iso_ccitt)
 								DEFINE_OID(nist_hashalgs()+2, id_sha384)
 								DEFINE_OID(nist_hashalgs()+3, id_sha512)
 
-NAMESPACE_END
+}
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/osrng.cpp b/stepmania/src/crypto51/osrng.cpp
index 6a2bf0dd99..e6a66925b1 100644
--- a/stepmania/src/crypto51/osrng.cpp
+++ b/stepmania/src/crypto51/osrng.cpp
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #endif
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 #if defined(NONBLOCKING_RNG_AVAILABLE) || defined(BLOCKING_RNG_AVAILABLE)
 OS_RNG_Err::OS_RNG_Err(const std::string &operation)
@@ -99,6 +99,6 @@ void NonblockingRng::GenerateBlock(byte *output, unsigned int size)
 #endif
 }
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/osrng.h b/stepmania/src/crypto51/osrng.h
index 51fae7c38a..8707ebfa51 100644
--- a/stepmania/src/crypto51/osrng.h
+++ b/stepmania/src/crypto51/osrng.h
@@ -10,7 +10,7 @@
 #include "cryptlib.h"
 #include "filters.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! Exception class for Operating-System Random Number Generator.
 class OS_RNG_Err : public Exception
@@ -55,6 +55,6 @@ protected:
 #endif
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/pkcspad.cpp b/stepmania/src/crypto51/pkcspad.cpp
index facbc3589c..945cd1d578 100644
--- a/stepmania/src/crypto51/pkcspad.cpp
+++ b/stepmania/src/crypto51/pkcspad.cpp
@@ -4,7 +4,7 @@
 #include "pkcspad.h"
 #include <assert.h>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 template<> const byte PKCS_DigestDecoration<SHA>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04,0x14};
 template<> const unsigned int PKCS_DigestDecoration<SHA>::length = sizeof(PKCS_DigestDecoration<SHA>::decoration);
@@ -41,4 +41,4 @@ void PKCS1v15_SignatureMessageEncodingMethod::ComputeMessageRepresentative(Rando
 	hash.Final(pDigest);
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/pkcspad.h b/stepmania/src/crypto51/pkcspad.h
index 8b0a6b0abc..309e0d499e 100644
--- a/stepmania/src/crypto51/pkcspad.h
+++ b/stepmania/src/crypto51/pkcspad.h
@@ -4,7 +4,7 @@
 #include "cryptlib.h"
 #include "pubkey.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! <a href="http://www.weidai.com/scan-mirror/ca.html#cem_PKCS1-1.5">EME-PKCS1-v1_5</a>
 
@@ -46,6 +46,6 @@ struct PKCS1v15 : public SignatureStandard
 
 class SHA;
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/pubkey.cpp b/stepmania/src/crypto51/pubkey.cpp
index d7e0955d4c..6844b33194 100644
--- a/stepmania/src/crypto51/pubkey.cpp
+++ b/stepmania/src/crypto51/pubkey.cpp
@@ -3,7 +3,7 @@
 #include "pch.h"
 #include "pubkey.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 void P1363_MGF1KDF2_Common(HashTransformation &hash, byte *output, unsigned int outputLength, const byte *input, unsigned int inputLength, bool mask, unsigned int counterStart)
 {
@@ -99,4 +99,4 @@ DecodingResult TF_VerifierBase::RecoverAndRestart(byte *recoveredMessage, PK_Mes
 	return result;
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/pubkey.h b/stepmania/src/crypto51/pubkey.h
index 4c08bab004..5d0b514226 100644
--- a/stepmania/src/crypto51/pubkey.h
+++ b/stepmania/src/crypto51/pubkey.h
@@ -42,7 +42,7 @@
 // VC60 workaround: this macro is defined in shlobj.h and conflicts with a template parameter used in this file
 #undef INTERFACE
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 Integer NR_EncodeDigest(unsigned int modulusBits, const byte *digest, unsigned int digestLen);
 Integer DSA_EncodeDigest(unsigned int modulusBits, const byte *digest, unsigned int digestLen);
@@ -597,6 +597,6 @@ public:
 	typedef PK_FinalTemplate<TF_VerifierImpl<SchemeOptions> > Verifier;
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/queue.cpp b/stepmania/src/crypto51/queue.cpp
index a01e213845..824020805b 100644
--- a/stepmania/src/crypto51/queue.cpp
+++ b/stepmania/src/crypto51/queue.cpp
@@ -4,7 +4,7 @@
 #include "queue.h"
 #include "filters.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 // this class for use by ByteQueue only
 class ByteQueueNode
@@ -515,4 +515,4 @@ unsigned int ByteQueue::Walker::CopyRangeTo2(BufferedTransformation &target, uns
 	return blockedBytes;
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/queue.h b/stepmania/src/crypto51/queue.h
index e247d9f690..b44bf66787 100644
--- a/stepmania/src/crypto51/queue.h
+++ b/stepmania/src/crypto51/queue.h
@@ -6,7 +6,7 @@
 #include "simple.h"
 //#include <algorithm>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 /** The queue is implemented as a linked list of byte arrays, but you don't need to
     know about that.  So just ignore this next line. :) */
@@ -116,13 +116,13 @@ private:
 	ByteQueue &m_bq;
 };
 
-NAMESPACE_END
+}
 
 NAMESPACE_BEGIN(std)
 template<> inline void swap(CryptoPP::ByteQueue &a, CryptoPP::ByteQueue &b)
 {
 	a.swap(b);
 }
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/rsa.cpp b/stepmania/src/crypto51/rsa.cpp
index c61f7b4ecc..1b669fe0de 100644
--- a/stepmania/src/crypto51/rsa.cpp
+++ b/stepmania/src/crypto51/rsa.cpp
@@ -10,7 +10,7 @@
 #include "algparam.h"
 
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
  
 OID RSAFunction::GetAlgorithmID() const
@@ -232,4 +232,4 @@ void InvertibleRSAFunction::AssignFrom(const NameValuePairs &source)
 		;
 }
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/rsa.h b/stepmania/src/crypto51/rsa.h
index 711678ce23..0833773289 100644
--- a/stepmania/src/crypto51/rsa.h
+++ b/stepmania/src/crypto51/rsa.h
@@ -10,7 +10,7 @@
 #include "integer.h"
 #include "asn.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! .
 class RSAFunction : public TrapdoorFunction, public X509PublicKey
@@ -118,6 +118,6 @@ struct RSASS : public TF_SS<STANDARD, H, RSA>
 typedef RSASS<PKCS1v15, SHA>::Signer RSASSA_PKCS1v15_SHA_Signer;
 typedef RSASS<PKCS1v15, SHA>::Verifier RSASSA_PKCS1v15_SHA_Verifier;
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/secblock.h b/stepmania/src/crypto51/secblock.h
index d0675a5cc8..9e1b371363 100644
--- a/stepmania/src/crypto51/secblock.h
+++ b/stepmania/src/crypto51/secblock.h
@@ -8,7 +8,7 @@
 #include <string.h>		// CodeWarrior doesn't have memory.h
 #include <assert.h>
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 // ************** secure memory allocation ***************
 
@@ -365,7 +365,7 @@ inline bool operator==(const CryptoPP::AllocatorWithCleanup<T>&, const CryptoPP:
 template<class T, class U>
 inline bool operator!=(const CryptoPP::AllocatorWithCleanup<T>&, const CryptoPP::AllocatorWithCleanup<U>&) {return (false);}
 
-NAMESPACE_END
+}
 
 NAMESPACE_BEGIN(std)
 template <class T, class A>
@@ -383,6 +383,6 @@ __stl_alloc_rebind(CryptoPP::AllocatorWithCleanup<_Tp1>& __a, const _Tp2*)
 }
 #endif
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/seckey.h b/stepmania/src/crypto51/seckey.h
index b1543a820d..a883c9ffbb 100644
--- a/stepmania/src/crypto51/seckey.h
+++ b/stepmania/src/crypto51/seckey.h
@@ -9,7 +9,7 @@
 #include "misc.h"
 #include "simple.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 //! .
 template <unsigned int N>
@@ -105,6 +105,6 @@ struct SymmetricCipherDocumentation
 	typedef SymmetricCipher Decryption;
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/sha.cpp b/stepmania/src/crypto51/sha.cpp
index 2196f289e9..e55103de14 100644
--- a/stepmania/src/crypto51/sha.cpp
+++ b/stepmania/src/crypto51/sha.cpp
@@ -7,7 +7,7 @@
 #include "sha.h"
 #include "misc.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 void SHA::Init()
 {
@@ -80,4 +80,4 @@ void SHA::Transform(word32 *state, const word32 *data)
 
 // *************************************************************
 
-NAMESPACE_END
+}
diff --git a/stepmania/src/crypto51/sha.h b/stepmania/src/crypto51/sha.h
index 9f77ae7c63..478390353c 100644
--- a/stepmania/src/crypto51/sha.h
+++ b/stepmania/src/crypto51/sha.h
@@ -3,7 +3,7 @@
 
 #include "iterhash.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 /// <a href="http://www.weidai.com/scan-mirror/md.html#SHA-1">SHA-1</a>
 class SHA : public IteratedHashWithStaticTransform<word32, BigEndian, 64, SHA>
@@ -20,6 +20,6 @@ protected:
 
 typedef SHA SHA1;
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/simple.h b/stepmania/src/crypto51/simple.h
index 55169cb9ae..df055492be 100644
--- a/stepmania/src/crypto51/simple.h
+++ b/stepmania/src/crypto51/simple.h
@@ -9,7 +9,7 @@
 #include "cryptlib.h"
 #include "misc.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 template <class BASE, class ALGORITHM_INFO = BASE>
 class AlgorithmImpl : public BASE
@@ -185,6 +185,6 @@ public:
 		{return 0;}
 };
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/smartptr.h b/stepmania/src/crypto51/smartptr.h
index 472006bcc2..ede88369b1 100644
--- a/stepmania/src/crypto51/smartptr.h
+++ b/stepmania/src/crypto51/smartptr.h
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 template<class T> class member_ptr
 {
@@ -40,6 +40,6 @@ protected:
 template <class T> member_ptr<T>::~member_ptr() {delete m_p;}
 template <class T> void member_ptr<T>::reset(T *p) {delete m_p; m_p = p;}
 
-NAMESPACE_END
+}
 
 #endif
diff --git a/stepmania/src/crypto51/words.h b/stepmania/src/crypto51/words.h
index 8849b61071..14d1b3c073 100644
--- a/stepmania/src/crypto51/words.h
+++ b/stepmania/src/crypto51/words.h
@@ -3,7 +3,7 @@
 
 #include "misc.h"
 
-NAMESPACE_BEGIN(CryptoPP)
+namespace CryptoPP {
 
 inline unsigned int CountWords(const word *X, unsigned int N)
 {
@@ -98,6 +98,6 @@ inline void ShiftWordsRightByWords(word *r, unsigned int n, unsigned int shiftWo
 	}
 }
 
-NAMESPACE_END
+}
 
 #endif