aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-12-03 20:02:47 +0100
committerGitHub <noreply@github.com>2020-12-03 20:02:47 +0100
commit7d79f28b0c89ecc4f314423a9d49ff54b52b8f9e (patch)
tree2ef2b977cbb3a3a486312ad61da261d8c0010fee /searchcore
parentaba435f85a60e9445a40c97aac250022551fb9d4 (diff)
parent13148035ce5843881e89f14ad2d644ac58a1b7ef (diff)
Merge pull request #15647 from vespa-engine/toregge/dont-increment-or-decrement-volatile-variables
Don't increment or decrement volatile variables. It is deprecated when using C++20.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/querylimiter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querylimiter.h b/searchcore/src/vespa/searchcore/proton/matching/querylimiter.h
index 45783959957..576c5921b61 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/querylimiter.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/querylimiter.h
@@ -37,7 +37,7 @@ private:
void releaseToken();
std::mutex _lock;
std::condition_variable _cond;
- volatile int _activeThreads;
+ int _activeThreads;
// These are updated asynchronously at reconfig.
volatile int _maxThreads;