diff options
Diffstat (limited to 'src/xmlpatterns/data/qabstractfloatcasters.cpp')
| -rw-r--r-- | src/xmlpatterns/data/qabstractfloatcasters.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/xmlpatterns/data/qabstractfloatcasters.cpp b/src/xmlpatterns/data/qabstractfloatcasters.cpp index 2d20a49..f41bb4a 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters.cpp +++ b/src/xmlpatterns/data/qabstractfloatcasters.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,7 +63,6 @@ template <const bool isDouble> Item BooleanToAbstractFloatCaster<isDouble>::castFrom(const Item &from, const QExplicitlySharedDataPointer<DynamicContext> &context) const { -#if defined(Q_CC_RVCT) // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is // passed directly into another constructor. bool tempDouble = isDouble; @@ -71,11 +70,5 @@ Item BooleanToAbstractFloatCaster<isDouble>::castFrom(const Item &from, return tempDouble ? toItem(CommonValues::DoubleOne) : toItem(CommonValues::FloatOne); else return tempDouble ? toItem(CommonValues::DoubleZero) : toItem(CommonValues::FloatZero); -#else - if(from.template as<AtomicValue>()->evaluateEBV(context)) - return isDouble ? toItem(CommonValues::DoubleOne) : toItem(CommonValues::FloatOne); - else - return isDouble ? toItem(CommonValues::DoubleZero) : toItem(CommonValues::FloatZero); -#endif } |