diff options
-rw-r--r-- | bench.cpp | 2 | ||||
-rw-r--r-- | bench.h | 3 | ||||
-rw-r--r-- | test.cpp | 9 |
3 files changed, 5 insertions, 9 deletions
@@ -206,8 +206,6 @@ void BenchMarkKeyless(const char *name, double timeTotal, T *x=NULL) BenchMark(name, c, timeTotal); } -void BenchmarkAll2(double t); - void BenchmarkAll(double t) { #if 1 @@ -5,6 +5,7 @@ extern const double CLOCK_TICKS_PER_SECOND; -void BenchmarkAll(double t=1.0); +void BenchmarkAll(double t); +void BenchmarkAll2(double t); #endif @@ -265,12 +265,9 @@ int CRYPTOPP_CDECL main(int argc, char *argv[]) else if (command == "v") return !Validate(argc>2 ? atoi(argv[2]) : 0, argv[1][1] == 'v', argc>3 ? argv[3] : NULL); else if (command == "b") - { - if (argc<3) - BenchmarkAll(); - else - BenchmarkAll((float)atof(argv[2])); - } + BenchmarkAll(argc<3 ? 1 : atof(argv[2])); + else if (command == "b2") + BenchmarkAll2(argc<3 ? 1 : atof(argv[2])); else if (command == "z") GzipFile(argv[3], argv[4], argv[2][0]-'0'); else if (command == "u") |