summaryrefslogtreecommitdiffstats
path: root/vsm
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-05-04 18:04:38 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-05-05 10:54:42 +0200
commitc2b77e7a3534a3b7ec2c63ed80fc3b771c3f3ba7 (patch)
tree98d64250cf07e5d0e3a58e38bfa8783fc34b90c5 /vsm
parenta6473653328bfa0b06d12d31955f0d22decea798 (diff)
ISO C++1z does not allow ‘register’ storage class specifier (gcc 7)
Diffstat (limited to 'vsm')
-rw-r--r--vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp
index 46a109c36e9..06f521ebab0 100644
--- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp
+++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp
@@ -84,7 +84,7 @@ FUTF8StrChrFieldSearcher::lfoldua(const char * toFold, size_t sz, char * folded,
namespace {
-inline const char * advance(const char * n, register const v16qi zero)
+inline const char * advance(const char * n, const v16qi zero)
{
uint32_t charMap = 0;
unsigned zeroCountSum = 0;
@@ -126,7 +126,7 @@ inline const char * advance(const char * n, register const v16qi zero)
size_t FUTF8StrChrFieldSearcher::match(const char *folded, size_t sz, QueryTerm & qt)
{
- register const v16qi _G_zero = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ const v16qi _G_zero = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
termcount_t words(0);
const char * term;
termsize_t tsz = qt.term(term);
@@ -170,7 +170,7 @@ size_t FUTF8StrChrFieldSearcher::match(const char *folded, size_t sz, QueryTerm
size_t FUTF8StrChrFieldSearcher::match(const char *folded, size_t sz, size_t mintsz, QueryTerm ** qtl, size_t qtlSize)
{
(void) mintsz;
- register const v16qi _G_zero = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ const v16qi _G_zero = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
termcount_t words(0);
const char * n = folded;
const char *e = n + sz;