summaryrefslogtreecommitdiffstats
path: root/src/dom/xpathparser.cpp
diff options
context:
space:
mode:
authorAndrew Higginson <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
committerAndrew <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
commit80960b623a99aae1402ab651b2974ef544ed3b03 (patch)
treeba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/dom/xpathparser.cpp
parenttry to fix bug (diff)
parentGDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff)
downloadinkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz
inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/dom/xpathparser.cpp')
-rw-r--r--src/dom/xpathparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dom/xpathparser.cpp b/src/dom/xpathparser.cpp
index bbe0fcc40..f0e929687 100644
--- a/src/dom/xpathparser.cpp
+++ b/src/dom/xpathparser.cpp
@@ -1,4 +1,4 @@
-/**
+/*
* Phoebe DOM Implementation.
*
* This is a C++ approximation of the W3C DOM model, which follows
@@ -467,7 +467,7 @@ int XPathParser::lexicalScan()
{
long op = (long)entry->ival;
//according to the disambiguating rule for * in the spec
- if (op == MULTIPLY && lexicalTokens.size() > 0)
+ if (op == MULTIPLY && !lexicalTokens.empty())
{
int ltyp = lexTokType(lexicalTokens.size()-1);
if (ltyp != AMPR && ltyp != DOUBLE_COLON &&