summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/functions/qsequencefns_p.h
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/functions/qsequencefns_p.h
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/functions/qsequencefns_p.h')
-rw-r--r--src/xmlpatterns/functions/qsequencefns_p.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index 18d2806..f16462f 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -146,28 +146,20 @@ namespace QPatternist
*/
virtual Expression::Ptr compress(const StaticContext::Ptr &context)
{
-#if defined(Q_CC_RVCT) && !defined(QT_NO_DEBUG)
// RVCT doesn't like using template parameter in trinary operator when the trinary operator result is
// passed directly into another constructor.
bool tempAssert = (Id == IDExistsFN || Id == IDEmptyFN);
Q_ASSERT(tempAssert);
-#else
- Q_ASSERT(Id == IDExistsFN || Id == IDEmptyFN);
-#endif
const Expression::Ptr me(FunctionCall::compress(context));
if(me != this)
return me;
-#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.
Expression::ID tempId = Id;
const Cardinality myCard((tempId == IDExistsFN) ? Cardinality::oneOrMore() : Cardinality::empty());
-#else
- const Cardinality myCard((Id == IDExistsFN) ? Cardinality::oneOrMore() : Cardinality::empty());
-#endif
const Cardinality card(m_operands.first()->staticType()->cardinality());
if(myCard.isMatch(card))