summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:17:23 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-20 16:17:23 +0200
commit59039554bd6bbf98e4ba111ecb20769c57db0d4d (patch)
treeb87385095733c9f3c1ca6d73131a7e6d46d2995e
parent46ab901c3f1a1f12ed7ad05a17cef19d1672c39e (diff)
parent4674a1cdf9cb721c9306576a76d4fe2c6425fe51 (diff)
downloadqtxmlpatterns-59039554bd6bbf98e4ba111ecb20769c57db0d4d.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I468ad5664b2c462812a0046d14024a19392f24db
-rw-r--r--src/xmlpatterns/parser/qtokenlookup.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xmlpatterns/parser/qtokenlookup.cpp b/src/xmlpatterns/parser/qtokenlookup.cpp
index 1b144bc..f188d74 100644
--- a/src/xmlpatterns/parser/qtokenlookup.cpp
+++ b/src/xmlpatterns/parser/qtokenlookup.cpp
@@ -99,7 +99,7 @@ public:
};
inline unsigned int
-TokenLookup::hash (register const char *str, register unsigned int len)
+TokenLookup::hash (const char *str, unsigned int len)
{
static const unsigned char asso_values[] =
{
@@ -130,7 +130,7 @@ TokenLookup::hash (register const char *str, register unsigned int len)
230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
230, 230, 230, 230, 230, 230
};
- register int hval = len;
+ int hval = len;
switch (hval)
{
@@ -146,7 +146,7 @@ TokenLookup::hash (register const char *str, register unsigned int len)
}
const struct TokenMap *
-TokenLookup::value (register const char *str, register unsigned int len)
+TokenLookup::value (const char *str, unsigned int len)
{
enum
{
@@ -424,11 +424,11 @@ TokenLookup::value (register const char *str, register unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash (str, len);
+ int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register const char *s = wordlist[key].name;
+ const char *s = wordlist[key].name;
if (*str == *s && !strcmp (str + 1, s + 1))
return &wordlist[key];