diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h index 7469f14063c..0433ca205b6 100644 --- a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h +++ b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h @@ -87,7 +87,7 @@ private: static PerService globalService(const ServiceMapping &mapping) { return {false, false, {}, mapping.spec}; - } + } using Map = std::map<vespalib::string, PerService>; @@ -96,7 +96,7 @@ private: ServiceMapHistory _history; MappingMonitor::UP _mappingMonitor; std::unique_ptr<MapSubscription> _subscription; - + void doAdd(const ServiceMapping &mapping); void doRemove(const ServiceMapping &mapping); diff --git a/slobrok/src/vespa/slobrok/server/map_diff.h b/slobrok/src/vespa/slobrok/server/map_diff.h index 638d4cd5d4c..39a33685750 100644 --- a/slobrok/src/vespa/slobrok/server/map_diff.h +++ b/slobrok/src/vespa/slobrok/server/map_diff.h @@ -15,7 +15,7 @@ struct MapDiff { /** construct incremental diff */ MapDiff(const vespalib::GenCnt &from, std::vector<vespalib::string> remove, - ServiceMappingList update, + ServiceMappingList update, const vespalib::GenCnt &to) : fromGen(from), removed(std::move(remove)), @@ -31,7 +31,7 @@ struct MapDiff { MapDiff(MapDiff &&) noexcept; ~MapDiff(); - + // is this a diff from the empty map: bool is_full_dump() const { return fromGen == vespalib::GenCnt(0); } diff --git a/slobrok/src/vespa/slobrok/server/proxy_map_source.h b/slobrok/src/vespa/slobrok/server/proxy_map_source.h index 449728b7531..755763bd4cb 100644 --- a/slobrok/src/vespa/slobrok/server/proxy_map_source.h +++ b/slobrok/src/vespa/slobrok/server/proxy_map_source.h @@ -17,7 +17,7 @@ class ProxyMapSource : public MapSource, public MapListener { public: ProxyMapSource(); ~ProxyMapSource(); - + void add(const ServiceMapping &mapping) override; void remove(const ServiceMapping &mapping) override; void update(const ServiceMapping &old_mapping, diff --git a/slobrok/src/vespa/slobrok/server/service_map_history.h b/slobrok/src/vespa/slobrok/server/service_map_history.h index e97d98a2aff..6ca8b2b4806 100644 --- a/slobrok/src/vespa/slobrok/server/service_map_history.h +++ b/slobrok/src/vespa/slobrok/server/service_map_history.h @@ -56,7 +56,7 @@ private: UpdateLog _log; void notify_updated(); - + const Generation &myGen() const { return _log.currentGeneration; } public: |