From 22c3e411334041c8959055d1d104c3039f1e46b1 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 30 Jul 2015 17:35:58 -0400 Subject: =?UTF-8?q?Removed=20USING=5FNAMESPACE(std).=20Changed=20cout=20?= =?UTF-8?q?=E2=86=92=20std::cout,=20cerr=20=E2=86=92=20std::cerr,=20...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bench2.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'bench2.cpp') diff --git a/bench2.cpp b/bench2.cpp index ca08a99d..80d02d2f 100644 --- a/bench2.cpp +++ b/bench2.cpp @@ -28,7 +28,6 @@ #include 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 << "" << endl; - cout << "
OperationMilliseconds/Operation" << (g_hertz ? "Megacycles/Operation" : "") << endl; + std::cout << "" << std::endl; + std::cout << ""; + std::cout << "\n"; BenchMarkCrypto > >("TestData/rsa1024.dat", "RSA 1024", t); BenchMarkCrypto > >("TestData/luc1024.dat", "LUC 1024", t); BenchMarkCrypto >("TestData/dlie1024.dat", "DLIES 1024", t); BenchMarkCrypto >("TestData/lucc512.dat", "LUCELG 512", t); - cout << "\n"; + std::cout << "\n"; BenchMarkCrypto > >("TestData/rsa2048.dat", "RSA 2048", t); BenchMarkCrypto > >("TestData/luc2048.dat", "LUC 2048", t); BenchMarkCrypto >("TestData/dlie2048.dat", "DLIES 2048", t); BenchMarkCrypto >("TestData/lucc1024.dat", "LUCELG 1024", t); - cout << "\n"; + std::cout << "\n"; BenchMarkSignature >("TestData/rsa1024.dat", "RSA 1024", t); BenchMarkSignature >("TestData/rw1024.dat", "RW 1024", t); BenchMarkSignature >("TestData/luc1024.dat", "LUC 1024", t); @@ -258,7 +257,7 @@ void BenchmarkAll2(double t, double hertz) BenchMarkSignature >("TestData/esig1023.dat", "ESIGN 1023", t); BenchMarkSignature >("TestData/esig1536.dat", "ESIGN 1536", t); - cout << "\n"; + std::cout << "\n"; BenchMarkSignature >("TestData/rsa2048.dat", "RSA 2048", t); BenchMarkSignature >("TestData/rw2048.dat", "RW 2048", t); BenchMarkSignature >("TestData/luc2048.dat", "LUC 2048", t); @@ -266,7 +265,7 @@ void BenchmarkAll2(double t, double hertz) BenchMarkSignature >("TestData/lucs1024.dat", "LUC-HMP 1024", t); BenchMarkSignature >("TestData/esig2046.dat", "ESIGN 2046", t); - cout << "\n"; + std::cout << "\n"; BenchMarkKeyAgreement("TestData/xtrdh171.dat", "XTR-DH 171", t); BenchMarkKeyAgreement("TestData/xtrdh342.dat", "XTR-DH 342", t); BenchMarkKeyAgreement("TestData/dh1024.dat", "DH 1024", t); @@ -276,7 +275,7 @@ void BenchmarkAll2(double t, double hertz) BenchMarkKeyAgreement("TestData/mqv1024.dat", "MQV 1024", t); BenchMarkKeyAgreement("TestData/mqv2048.dat", "MQV 2048", t); - cout << "\n"; + std::cout << "\n"; { ECIES::Decryptor cpriv(GlobalRNG(), ASN1::secp256k1()); ECIES::Encryptor cpub(cpriv); @@ -295,7 +294,7 @@ void BenchmarkAll2(double t, double hertz) BenchMarkAgreement("ECMQVC over GF(p) 256", ecmqvc, t); } - cout << "" << endl; + std::cout << "" << std::endl; { ECIES::Decryptor cpriv(GlobalRNG(), ASN1::sect233r1()); ECIES::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 << "
OperationMilliseconds/Operation" << (g_hertz ? "Megacycles/Operation" : "") << std::endl; - cout << "\n
" << endl; + std::cout << "
" << std::endl; } -- cgit v1.2.1