Removed USING_NAMESPACE(std). Changed cout → std::cout, cerr → std::cerr, ...

1 files changed, 10 insertions, 11 deletions

diff --git a/bench2.cpp b/bench2.cpp
index ca08a99d..80d02d2f 100644
--- a/bench2.cpp
+++ b/bench2.cpp
@@ -28,7 +28,6 @@
 #include <iomanip>
 
 USING_NAMESPACE(CryptoPP)
-USING_NAMESPACE(std)
 
 void OutputResultOperations(const char *name, const char *operation, bool pc, unsigned long iterations, double timeTaken);
 
@@ -233,22 +232,22 @@ void BenchmarkAll2(double t, double hertz)
 {
 	g_hertz = hertz;
 
-	cout << "<TABLE border=1><COLGROUP><COL align=left><COL align=right><COL align=right>" << endl;
-	cout << "<THEAD><TR><TH>Operation<TH>Milliseconds/Operation" << (g_hertz ? "<TH>Megacycles/Operation" : "") << endl;
+	std::cout << "<TABLE border=1><COLGROUP><COL align=left><COL align=right><COL align=right>" << std::endl;
+	std::cout << "<THEAD><TR><TH>Operation<TH>Milliseconds/Operation" << (g_hertz ? "<TH>Megacycles/Operation" : "") << std::endl;
 
-	cout << "\n<TBODY style=\"background: yellow\">";
+	std::cout << "\n<TBODY style=\"background: yellow\">";
 	BenchMarkCrypto<RSAES<OAEP<SHA> > >("TestData/rsa1024.dat", "RSA 1024", t);
 	BenchMarkCrypto<LUCES<OAEP<SHA> > >("TestData/luc1024.dat", "LUC 1024", t);
 	BenchMarkCrypto<DLIES<> >("TestData/dlie1024.dat", "DLIES 1024", t);
 	BenchMarkCrypto<LUC_IES<> >("TestData/lucc512.dat", "LUCELG 512", t);
 
-	cout << "\n<TBODY style=\"background: white\">";
+	std::cout << "\n<TBODY style=\"background: white\">";
 	BenchMarkCrypto<RSAES<OAEP<SHA> > >("TestData/rsa2048.dat", "RSA 2048", t);
 	BenchMarkCrypto<LUCES<OAEP<SHA> > >("TestData/luc2048.dat", "LUC 2048", t);
 	BenchMarkCrypto<DLIES<> >("TestData/dlie2048.dat", "DLIES 2048", t);
 	BenchMarkCrypto<LUC_IES<> >("TestData/lucc1024.dat", "LUCELG 1024", t);
 
-	cout << "\n<TBODY style=\"background: yellow\">";
+	std::cout << "\n<TBODY style=\"background: yellow\">";
 	BenchMarkSignature<RSASS<PSSR, SHA> >("TestData/rsa1024.dat", "RSA 1024", t);
 	BenchMarkSignature<RWSS<PSSR, SHA> >("TestData/rw1024.dat", "RW 1024", t);
 	BenchMarkSignature<LUCSS<PSSR, SHA> >("TestData/luc1024.dat", "LUC 1024", t);
@@ -258,7 +257,7 @@ void BenchmarkAll2(double t, double hertz)
 	BenchMarkSignature<ESIGN<SHA> >("TestData/esig1023.dat", "ESIGN 1023", t);
 	BenchMarkSignature<ESIGN<SHA> >("TestData/esig1536.dat", "ESIGN 1536", t);
 
-	cout << "\n<TBODY style=\"background: white\">";
+	std::cout << "\n<TBODY style=\"background: white\">";
 	BenchMarkSignature<RSASS<PSSR, SHA> >("TestData/rsa2048.dat", "RSA 2048", t);
 	BenchMarkSignature<RWSS<PSSR, SHA> >("TestData/rw2048.dat", "RW 2048", t);
 	BenchMarkSignature<LUCSS<PSSR, SHA> >("TestData/luc2048.dat", "LUC 2048", t);
@@ -266,7 +265,7 @@ void BenchmarkAll2(double t, double hertz)
 	BenchMarkSignature<LUC_HMP<SHA> >("TestData/lucs1024.dat", "LUC-HMP 1024", t);
 	BenchMarkSignature<ESIGN<SHA> >("TestData/esig2046.dat", "ESIGN 2046", t);
 
-	cout << "\n<TBODY style=\"background: yellow\">";
+	std::cout << "\n<TBODY style=\"background: yellow\">";
 	BenchMarkKeyAgreement<XTR_DH>("TestData/xtrdh171.dat", "XTR-DH 171", t);
 	BenchMarkKeyAgreement<XTR_DH>("TestData/xtrdh342.dat", "XTR-DH 342", t);
 	BenchMarkKeyAgreement<DH>("TestData/dh1024.dat", "DH 1024", t);
@@ -276,7 +275,7 @@ void BenchmarkAll2(double t, double hertz)
 	BenchMarkKeyAgreement<MQV>("TestData/mqv1024.dat", "MQV 1024", t);
 	BenchMarkKeyAgreement<MQV>("TestData/mqv2048.dat", "MQV 2048", t);
 
-	cout << "\n<TBODY style=\"background: white\">";
+	std::cout << "\n<TBODY style=\"background: white\">";
 	{
 		ECIES<ECP>::Decryptor cpriv(GlobalRNG(), ASN1::secp256k1());
 		ECIES<ECP>::Encryptor cpub(cpriv);
@@ -295,7 +294,7 @@ void BenchmarkAll2(double t, double hertz)
 		BenchMarkAgreement("ECMQVC over GF(p) 256", ecmqvc, t);
 	}
 
-	cout << "<TBODY style=\"background: yellow\">" << endl;
+	std::cout << "<TBODY style=\"background: yellow\">" << std::endl;
 	{
 		ECIES<EC2N>::Decryptor cpriv(GlobalRNG(), ASN1::sect233r1());
 		ECIES<EC2N>::Encryptor cpub(cpriv);
@@ -313,5 +312,5 @@ void BenchmarkAll2(double t, double hertz)
 		BenchMarkKeyGen("ECMQVC over GF(2^n) 233", ecmqvc, t);
 		BenchMarkAgreement("ECMQVC over GF(2^n) 233", ecmqvc, t);
 	}
-	cout << "</TABLE>" << endl;
+	std::cout << "</TABLE>" << std::endl;
 }