Change ::log() to log() to work with C++Builder (#552)

As reported in #520, C++Builder standard libraries don't have a `log()` function at global namespace. Change the invocations to unqualified name lookup, and apply a using-declaration to `std::log()` when compiling under C++Builder.
pull/548/merge
Tanzinul Islam 2017-12-30 20:16:27 +00:00 committed by Jeffrey Walton
parent 1699562581
commit b4df31c7f9
3 changed files with 10 additions and 4 deletions

View File

@ -70,7 +70,7 @@ void OutputResultBytes(const char *name, double length, double timeTaken)
else else
std::cout << "<TD>" << std::setprecision(1) << std::setiosflags(std::ios::fixed) << cpb; std::cout << "<TD>" << std::setprecision(1) << std::setiosflags(std::ios::fixed) << cpb;
} }
g_logTotal += ::log(mbs); g_logTotal += log(mbs);
g_logCount++; g_logCount++;
} }
@ -109,7 +109,7 @@ void OutputResultOperations(const char *name, const char *operation, bool pc, un
std::cout << "<TD>" << std::setprecision(2) << std::setiosflags(std::ios::fixed) << t; std::cout << "<TD>" << std::setprecision(2) << std::setiosflags(std::ios::fixed) << t;
} }
g_logTotal += ::log(iterations/timeTaken); g_logTotal += log(iterations/timeTaken);
g_logCount++; g_logCount++;
} }

View File

@ -1021,14 +1021,14 @@ unsigned int FactoringWorkFactor(unsigned int n)
// extrapolated from the table in Odlyzko's "The Future of Integer Factorization" // extrapolated from the table in Odlyzko's "The Future of Integer Factorization"
// updated to reflect the factoring of RSA-130 // updated to reflect the factoring of RSA-130
if (n<5) return 0; if (n<5) return 0;
else return (unsigned int)(2.4 * std::pow((double)n, 1.0/3.0) * std::pow(::log(double(n)), 2.0/3.0) - 5); else return (unsigned int)(2.4 * std::pow((double)n, 1.0/3.0) * std::pow(log(double(n)), 2.0/3.0) - 5);
} }
unsigned int DiscreteLogWorkFactor(unsigned int n) unsigned int DiscreteLogWorkFactor(unsigned int n)
{ {
// assuming discrete log takes about the same time as factoring // assuming discrete log takes about the same time as factoring
if (n<5) return 0; if (n<5) return 0;
else return (unsigned int)(2.4 * std::pow((double)n, 1.0/3.0) * std::pow(::log(double(n)), 2.0/3.0) - 5); else return (unsigned int)(2.4 * std::pow((double)n, 1.0/3.0) * std::pow(log(double(n)), 2.0/3.0) - 5);
} }
// ******************************************************** // ********************************************************

View File

@ -62,4 +62,10 @@ namespace std {
# include <vector.cc> # include <vector.cc>
#endif #endif
// C++Builder's standard library (Dinkumware) do not have C's global log() function
// https://github.com/weidai11/cryptopp/issues/520
#ifdef __BORLANDC__
using std::log;
#endif
#endif #endif