database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Fully qualify ambiguous isnan() with std::

Browse Source
This commit is contained in:
David Mott
2019-04-17 17:28:47 -05:00
parent 241d0b0446
commit 67880c2319
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/execplan/treenode.h
View File

@ -608,7 +608,7 @@ inline const std::string& TreeNode::getStrVal()
int exponent = (int)floor(log10( fabs(fResult.floatVal))); // This will round down the exponent int exponent = (int)floor(log10( fabs(fResult.floatVal))); // This will round down the exponent
double base = fResult.floatVal * pow(10, -1.0 * exponent); double base = fResult.floatVal * pow(10, -1.0 * exponent);
if (isnan(exponent) || isnan(base)) if (isnan(exponent) || std::isnan(base))
{ {
snprintf(tmp, 312, "%f", fResult.floatVal); snprintf(tmp, 312, "%f", fResult.floatVal);
fResult.strVal = removeTrailing0(tmp, 312); fResult.strVal = removeTrailing0(tmp, 312);
@ -643,7 +643,7 @@ inline const std::string& TreeNode::getStrVal()
int exponent = (int)floor(log10( fabs(fResult.doubleVal))); // This will round down the exponent int exponent = (int)floor(log10( fabs(fResult.doubleVal))); // This will round down the exponent
double base = fResult.doubleVal * pow(10, -1.0 * exponent); double base = fResult.doubleVal * pow(10, -1.0 * exponent);
if (isnan(exponent) || isnan(base)) if (isnan(exponent) || std::isnan(base))
{ {
snprintf(tmp, 312, "%f", fResult.doubleVal); snprintf(tmp, 312, "%f", fResult.doubleVal);
fResult.strVal = removeTrailing0(tmp, 312); fResult.strVal = removeTrailing0(tmp, 312);