diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-05 13:29:05 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-05 13:29:05 +0100 |
commit | b40d5b80a0f9233e885bc9e73e9967f03fb3ab69 (patch) | |
tree | bc28ec37cbea122adb89b0b002bd4ef5bd766fbf /config | |
parent | 5bb268bee55c36935c134320e905b6cf3daccc00 (diff) |
Eliminate clang warning in config
Diffstat (limited to 'config')
-rw-r--r-- | config/src/tests/frt/frt.cpp | 2 | ||||
-rw-r--r-- | config/src/vespa/config/common/configmanager.cpp | 3 | ||||
-rw-r--r-- | config/src/vespa/config/common/configmanager.h | 1 | ||||
-rw-r--r-- | config/src/vespa/config/common/configparser.cpp | 2 | ||||
-rw-r--r-- | config/src/vespa/config/frt/frtconfigrequestfactory.h | 3 | ||||
-rw-r--r-- | config/src/vespa/config/helper/configpoller.cpp | 2 | ||||
-rw-r--r-- | config/src/vespa/config/set/configsetsource.h | 1 |
7 files changed, 6 insertions, 8 deletions
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp index 090991b7fe4..c225dd9dcf3 100644 --- a/config/src/tests/frt/frt.cpp +++ b/config/src/tests/frt/frt.cpp @@ -38,7 +38,7 @@ namespace { { } ConfigUpdate::UP provide() override { return ConfigUpdate::UP(); } void handle(ConfigUpdate::UP u) override { update = std::move(u); } - bool wait(int timeoutInMillis) { (void) timeoutInMillis; return notified; } + bool wait(uint64_t timeoutInMillis) override { (void) timeoutInMillis; return notified; } bool poll() override { return notified; } void interrupt() override { } diff --git a/config/src/vespa/config/common/configmanager.cpp b/config/src/vespa/config/common/configmanager.cpp index 0831853c2b4..521909fa836 100644 --- a/config/src/vespa/config/common/configmanager.cpp +++ b/config/src/vespa/config/common/configmanager.cpp @@ -19,8 +19,7 @@ ConfigManager::ConfigManager(SourceFactory::UP sourceFactory, int64_t initialGen _generation(initialGeneration), _subscriptionMap(), _lock(), - _firstLock(), - _first(true) + _firstLock() { } ConfigManager::~ConfigManager() { } diff --git a/config/src/vespa/config/common/configmanager.h b/config/src/vespa/config/common/configmanager.h index 740445292fe..e0e2bed6a53 100644 --- a/config/src/vespa/config/common/configmanager.h +++ b/config/src/vespa/config/common/configmanager.h @@ -42,7 +42,6 @@ private: SubscriptionMap _subscriptionMap; vespalib::Lock _lock; vespalib::Lock _firstLock; - bool _first; }; } // namespace config diff --git a/config/src/vespa/config/common/configparser.cpp b/config/src/vespa/config/common/configparser.cpp index e6105486c0c..87440e74e09 100644 --- a/config/src/vespa/config/common/configparser.cpp +++ b/config/src/vespa/config/common/configparser.cpp @@ -374,6 +374,4 @@ ConfigParser::convert<vespalib::string>(const vsvector & config) return deQuote(value); } -template bool ConfigParser::convert<bool>(const vsvector & config); - } // config diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.h b/config/src/vespa/config/frt/frtconfigrequestfactory.h index 047951bf4ad..9a35c1bb29e 100644 --- a/config/src/vespa/config/frt/frtconfigrequestfactory.h +++ b/config/src/vespa/config/frt/frtconfigrequestfactory.h @@ -23,6 +23,9 @@ public: FRTConfigRequest::UP createConfigRequest(const ConfigKey & key, Connection * connection, const ConfigState & state, int64_t serverTimeout) const; private: +#ifdef __clang__ + [[maybe_unused]] +#endif const int _protocolVersion; const int _traceLevel; const VespaVersion _vespaVersion; diff --git a/config/src/vespa/config/helper/configpoller.cpp b/config/src/vespa/config/helper/configpoller.cpp index 7953587f858..a1dc9570f6a 100644 --- a/config/src/vespa/config/helper/configpoller.cpp +++ b/config/src/vespa/config/helper/configpoller.cpp @@ -43,7 +43,7 @@ ConfigPoller::poll() for (size_t i = 0; i < _handleList.size(); i++) { ICallback * callback(_callbackList[i]); if (_handleList[i]->isChanged()) - callback->configure(std::move(_handleList[i]->getConfig())); + callback->configure(_handleList[i]->getConfig()); } } else { LOG(debug, "No new config available"); diff --git a/config/src/vespa/config/set/configsetsource.h b/config/src/vespa/config/set/configsetsource.h index d9a56b7a63e..983fc7d8fce 100644 --- a/config/src/vespa/config/set/configsetsource.h +++ b/config/src/vespa/config/set/configsetsource.h @@ -29,7 +29,6 @@ private: const ConfigKey _key; int64_t _generation; BuilderMapSP _builderMap; - int64_t _lastGeneration; ConfigState _lastState; bool validRequest(const ConfigKey & key); |