summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/data
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-19 07:30:16 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-19 07:30:16 (GMT)
commit7f43e476169bdc5b4b29dae4b49642f5e542c0aa (patch)
treecbb3c37e6d6520266181dfe086b9f0a3477af05c /src/xmlpatterns/data
parentc2dd348e4145ae53d25eb6595a03d5140e12e10e (diff)
downloadQt-7f43e476169bdc5b4b29dae4b49642f5e542c0aa.zip
Qt-7f43e476169bdc5b4b29dae4b49642f5e542c0aa.tar.gz
Qt-7f43e476169bdc5b4b29dae4b49642f5e542c0aa.tar.bz2
Fixed xmlpatterns review comments.
In comments it was stated that RVCT version is just fine for all platforms and ifdef are not needed. Also the compilers will really optimize extra temp variables for the other compilers. Reviewed-by: Janne Koskinen
Diffstat (limited to 'src/xmlpatterns/data')
-rw-r--r--src/xmlpatterns/data/qabstractfloatcasters.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/xmlpatterns/data/qabstractfloatcasters.cpp b/src/xmlpatterns/data/qabstractfloatcasters.cpp
index cdbeb67..f41bb4a 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters.cpp
+++ b/src/xmlpatterns/data/qabstractfloatcasters.cpp
@@ -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
}