summaryrefslogtreecommitdiff
path: root/Source/WebCore/xml/XPathValue.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-13 12:51:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 20:50:05 +0200
commitd441d6f39bb846989d95bcf5caf387b42414718d (patch)
treee367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/xml/XPathValue.cpp
parent0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)
downloadqtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/xml/XPathValue.cpp')
-rw-r--r--Source/WebCore/xml/XPathValue.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/xml/XPathValue.cpp b/Source/WebCore/xml/XPathValue.cpp
index 09ce87664..ed43f48be 100644
--- a/Source/WebCore/xml/XPathValue.cpp
+++ b/Source/WebCore/xml/XPathValue.cpp
@@ -74,7 +74,7 @@ bool Value::toBoolean() const
case BooleanValue:
return m_bool;
case NumberValue:
- return m_number != 0 && !isnan(m_number);
+ return m_number && !std::isnan(m_number);
case StringValue:
return !m_data->m_string.isEmpty();
}
@@ -123,12 +123,12 @@ String Value::toString() const
case StringValue:
return m_data->m_string;
case NumberValue:
- if (isnan(m_number))
+ if (std::isnan(m_number))
return "NaN";
if (m_number == 0)
return "0";
- if (isinf(m_number))
- return signbit(m_number) ? "-Infinity" : "Infinity";
+ if (std::isinf(m_number))
+ return std::signbit(m_number) ? "-Infinity" : "Infinity";
return String::number(m_number);
case BooleanValue:
return m_bool ? "true" : "false";