summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/parser/qtokensource_p.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-06-10 11:57:33 +0200
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-06-10 12:47:12 +0000
commitec9ab0ba6d0e28fc63f9ff28135ec9911ffa882b (patch)
tree922d4119ff2e535ac313bbbfcfca33b744524e77 /src/xmlpatterns/parser/qtokensource_p.h
parent8d5f3bd730486b3fd3d5b1782fa70b80108c0ba4 (diff)
downloadqtxmlpatterns-ec9ab0ba6d0e28fc63f9ff28135ec9911ffa882b.tar.gz
Prefixed all tokens with T_ to prevent collisions with macros.
Identifier names like "IN" and "AS" have a high probability of being defined by certain platforms as macros, esp. with Visual Studio. Change-Id: I1fbc0ae33f94387b83377181b6012683a418459a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/xmlpatterns/parser/qtokensource_p.h')
-rw-r--r--src/xmlpatterns/parser/qtokensource_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h
index acdf6c3..7070194 100644
--- a/src/xmlpatterns/parser/qtokensource_p.h
+++ b/src/xmlpatterns/parser/qtokensource_p.h
@@ -52,6 +52,7 @@
#include <private/qitemtype_p.h>
#include <private/qorderby_p.h>
#include <private/qpath_p.h>
+#include <private/qparsercontext_p.h>
#include <private/qquerytransformparser_p.h>
#include <private/qvalidate_p.h>
@@ -121,7 +122,7 @@ namespace QPatternist
bool hasError() const
{
- return type == ERROR;
+ return type == T_ERROR;
}
TokenType type;