diff options
author | Henning Baldersheim <balder@oath.com> | 2018-08-12 22:35:04 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-08-12 22:35:04 +0200 |
commit | d38b49ddb881a67250ed738382d1ff72283cd45b (patch) | |
tree | 150bd862d7d66a2928b8b45773102ccedfb50eff | |
parent | fded37d945ca2539c96621b9ae33806ebbadf875 (diff) |
Remove whitespace
32 files changed, 51 insertions, 51 deletions
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/query.h b/searchcore/src/vespa/searchcore/fdispatch/search/query.h index 315e087b4d7..b6949e70d8f 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/query.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/query.h @@ -25,7 +25,7 @@ public: FastS_query(const search::docsummary::GetDocsumArgs &docsumArgs); ~FastS_query(); - void SetStackDump(vespalib::stringref stackDump); + void SetStackDump(vespalib::stringref stackDump); void SetSortSpec(const char *spec) { _sortSpec = spec; } void SetLocation(const char *loc) { _location = loc; } void SetRankProperties(const search::fef::Properties &rp) { _rankProperties = rp; } diff --git a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp index c7a1b7749e1..d165a18ae37 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp @@ -44,7 +44,7 @@ vespalib::string LOOSE_STR("loose"); } AttributeLimiter::DiversityCutoffStrategy -AttributeLimiter::toDiversityCutoffStrategy(vespalib::stringref strategy) +AttributeLimiter::toDiversityCutoffStrategy(vespalib::stringref strategy) { return (strategy == STRICT_STR) ? DiversityCutoffStrategy::STRICT : DiversityCutoffStrategy::LOOSE; } diff --git a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.h b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.h index 63574ce3dcf..d7772c6a393 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.h +++ b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.h @@ -34,7 +34,7 @@ public: search::queryeval::SearchIterator::UP create_search(size_t want_hits, size_t max_group_size, bool strictSearch); bool was_used() const { return ((!_match_datas.empty()) || (_blueprint.get() != nullptr)); } ssize_t getEstimatedHits() const { return _estimatedHits; } - static DiversityCutoffStrategy toDiversityCutoffStrategy(vespalib::stringref strategy); + static DiversityCutoffStrategy toDiversityCutoffStrategy(vespalib::stringref strategy); private: const vespalib::string & toString(DiversityCutoffStrategy strategy); search::queryeval::Searchable & _searchable_attributes; diff --git a/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.h b/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.h index 0e464156f73..3eda6557fa0 100644 --- a/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.h +++ b/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.h @@ -17,7 +17,7 @@ public: * @param the name of the library. Like 'vesparise'. * @return the factory that is created. */ - IIndexManagerFactory::UP create(vespalib::stringref factory); + IIndexManagerFactory::UP create(vespalib::stringref factory); private: vespalib::LibraryPool _libraries; }; diff --git a/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.cpp b/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.cpp index 3e4a5c2bcfa..bd1b914cf39 100644 --- a/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.cpp +++ b/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.cpp @@ -44,7 +44,7 @@ FactoryRegistry::get(stringref uniqueName) const } bool -FactoryRegistry::isRegistered(vespalib::stringref uniqueName) const +FactoryRegistry::isRegistered(vespalib::stringref uniqueName) const { LockGuard guard(_lock); Registry::const_iterator found = _registry.find(uniqueName); diff --git a/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.h b/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.h index ce9f4d1813d..feb27d62950 100644 --- a/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.h +++ b/searchcorespi/src/vespa/searchcorespi/plugin/factoryregistry.h @@ -22,23 +22,23 @@ public: * @param factory The factory instance for producing IndexManagers. * @throws vespalib::IllegalArgument if factory is already registered. */ - void add(vespalib::stringref uniqueName, const IIndexManagerFactory::SP & factory); + void add(vespalib::stringref uniqueName, const IIndexManagerFactory::SP & factory); /** * Will unregister a factory. Should be called when a sharedlibrary is being unloaded. * @param uniqueName Unique name of factory to remove from registry. * @throws vespalib::IllegalArgument if factory is already registered. */ - void remove(vespalib::stringref uniqueName); + void remove(vespalib::stringref uniqueName); /** * This method will fetch a factory given its unique name. * @param name The name of the factory to return. * @return The factory. */ - const IIndexManagerFactory::SP & get(vespalib::stringref uniqueName) const; + const IIndexManagerFactory::SP & get(vespalib::stringref uniqueName) const; /** * Returns true if a factory with the given name has been registered. */ - bool isRegistered(vespalib::stringref uniqueName) const; + bool isRegistered(vespalib::stringref uniqueName) const; private: typedef std::map<vespalib::string, IIndexManagerFactory::SP> Registry; diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp index fbeaaa6070c..e86c3018242 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp @@ -118,7 +118,7 @@ AttributeVector::BaseName::getSnapshotName() const AttributeVector::BaseName::string -AttributeVector::BaseName::createAttributeName(vespalib::stringref s) +AttributeVector::BaseName::createAttributeName(vespalib::stringref s) { size_t p(s.rfind('/')); if (p == string::npos) { diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h index 53736a62572..21ffe811a80 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.h +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h @@ -131,7 +131,7 @@ public: : string(s), _name(createAttributeName(s)) { } - BaseName & operator = (vespalib::stringref s) { + BaseName & operator = (vespalib::stringref s) { BaseName n(s); std::swap(*this, n); return *this; @@ -147,7 +147,7 @@ public: const string & getAttributeName() const { return _name; } string getDirName() const; private: - static string createAttributeName(vespalib::stringref s); + static string createAttributeName(vespalib::stringref s); string _name; }; @@ -403,7 +403,7 @@ public: BasicType getInternalBasicType() const { return _config.basicType(); } CollectionType getInternalCollectionType() const { return _config.collectionType(); } const BaseName & getBaseFileName() const { return _baseFileName; } - void setBaseFileName(vespalib::stringref name) { _baseFileName = name; } + void setBaseFileName(vespalib::stringref name) { _baseFileName = name; } // Implements IAttributeVector const vespalib::string & getName() const override final { return _baseFileName.getAttributeName(); } diff --git a/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp b/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp index 6ae90642383..b0884d51db9 100644 --- a/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp +++ b/searchlib/src/vespa/searchlib/expression/documentfieldnode.cpp @@ -49,7 +49,7 @@ DocumentFieldNode & DocumentFieldNode::operator = (const DocumentFieldNode & rhs } std::unique_ptr<ResultNode> -deduceResultNode(vespalib::stringref fieldName, const FieldValue & fv, bool preserveAccurateTypes, bool nestedMultiValue) +deduceResultNode(vespalib::stringref fieldName, const FieldValue & fv, bool preserveAccurateTypes, bool nestedMultiValue) { std::unique_ptr<ResultNode> value; const Identifiable::RuntimeClass & cInfo = fv.getClass(); diff --git a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp index a072e06d811..603600847b7 100644 --- a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp +++ b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp @@ -40,7 +40,7 @@ StringBucketResultNode::StringBucketResultNode() : _from(new StringResultNode()), _to(new StringResultNode()) {} -StringBucketResultNode::StringBucketResultNode(vespalib::stringref from, vespalib::stringref to) +StringBucketResultNode::StringBucketResultNode(vespalib::stringref from, vespalib::stringref to) : _from(new StringResultNode(from)), _to(new StringResultNode(to)) {} diff --git a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h index c53fa06487c..dac84febeeb 100644 --- a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h +++ b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.h @@ -23,7 +23,7 @@ public: DECLARE_EXPRESSIONNODE(StringBucketResultNode); DECLARE_NBO_SERIALIZE; StringBucketResultNode(); - StringBucketResultNode(vespalib::stringref from, vespalib::stringref to); + StringBucketResultNode(vespalib::stringref from, vespalib::stringref to); StringBucketResultNode(ResultNode::UP from, ResultNode::UP to) : _from(from.release()), _to(to.release()) {} ~StringBucketResultNode(); size_t hash() const override; @@ -32,7 +32,7 @@ public: int contains(const ConstBufferRef & v) const { return contains(v.c_str()); } int contains(const char * v) const; void visitMembers(vespalib::ObjectVisitor &visitor) const override; - StringBucketResultNode &setRange(vespalib::stringref from, vespalib::stringref to) { + StringBucketResultNode &setRange(vespalib::stringref from, vespalib::stringref to) { _from.reset(new StringResultNode(from)); _to.reset(new StringResultNode(to)); return *this; diff --git a/searchlib/src/vespa/searchlib/expression/stringresultnode.h b/searchlib/src/vespa/searchlib/expression/stringresultnode.h index a071467e76c..2e8ddd57d94 100644 --- a/searchlib/src/vespa/searchlib/expression/stringresultnode.h +++ b/searchlib/src/vespa/searchlib/expression/stringresultnode.h @@ -13,14 +13,14 @@ public: DECLARE_NBO_SERIALIZE; void visitMembers(vespalib::ObjectVisitor &visitor) const override; StringResultNode(const char * v="") : _value(v) { } - StringResultNode(vespalib::stringref v) : _value(v) { } + StringResultNode(vespalib::stringref v) : _value(v) { } size_t hash() const override; int onCmp(const Identifiable & b) const override; void set(const ResultNode & rhs) override; StringResultNode & append(const ResultNode & rhs); StringResultNode & clear() { _value.clear(); return *this; } const vespalib::string & get() const { return _value; } - void set(vespalib::stringref value) { _value = value; } + void set(vespalib::stringref value) { _value = value; } void min(const ResultNode & b) override; void max(const ResultNode & b) override; void add(const ResultNode & b) override; diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.h b/searchlib/src/vespa/searchlib/features/dotproductfeature.h index 61fb418636d..c350494db0e 100644 --- a/searchlib/src/vespa/searchlib/features/dotproductfeature.h +++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.h @@ -73,7 +73,7 @@ public: **/ class IntegerVector : public VectorBase<int64_t, int64_t, feature_t> { public: - void insert(vespalib::stringref label, vespalib::stringref value) { + void insert(vespalib::stringref label, vespalib::stringref value) { _vector.push_back(std::make_pair(util::strToNum<int64_t>(label), util::strToNum<feature_t>(value))); } }; @@ -85,7 +85,7 @@ class StringVector : public VectorBase<vespalib::string, const char *, feature_t public: StringVector(); ~StringVector(); - void insert(vespalib::stringref label, vespalib::stringref value) { + void insert(vespalib::stringref label, vespalib::stringref value) { _vector.push_back(std::make_pair(label, util::strToNum<feature_t>(value))); } }; @@ -98,7 +98,7 @@ private: const search::attribute::IAttributeVector * _attribute; public: EnumVector(const search::attribute::IAttributeVector * attribute) : _attribute(attribute) {} - void insert(vespalib::stringref label, vespalib::stringref value) { + void insert(vespalib::stringref label, vespalib::stringref value) { search::attribute::EnumHandle e; if (_attribute->findEnum(label.data(), e)) { _vector.push_back(std::make_pair(e, util::strToNum<feature_t>(value))); diff --git a/searchlib/src/vespa/searchlib/fef/blueprint.cpp b/searchlib/src/vespa/searchlib/fef/blueprint.cpp index 4e1ccee99c4..6e04ede5253 100644 --- a/searchlib/src/vespa/searchlib/fef/blueprint.cpp +++ b/searchlib/src/vespa/searchlib/fef/blueprint.cpp @@ -27,7 +27,7 @@ Blueprint::describeOutput(vespalib::stringref outName, _dependency_handler->define_output(outName, type); } -Blueprint::Blueprint(vespalib::stringref baseName) +Blueprint::Blueprint(vespalib::stringref baseName) : _baseName(baseName), _name(), _dependency_handler(nullptr) diff --git a/searchlib/src/vespa/searchlib/fef/blueprint.h b/searchlib/src/vespa/searchlib/fef/blueprint.h index 617edbd0613..53c06dbd4cc 100644 --- a/searchlib/src/vespa/searchlib/fef/blueprint.h +++ b/searchlib/src/vespa/searchlib/fef/blueprint.h @@ -107,7 +107,7 @@ public: * class. The @ref setup method is used to tailor a blueprint * object for a specific set of parameters. **/ - Blueprint(vespalib::stringref baseName); + Blueprint(vespalib::stringref baseName); /** * Obtain the base name of this blueprint. This method will diff --git a/searchlib/src/vespa/searchlib/fef/parametervalidator.h b/searchlib/src/vespa/searchlib/fef/parametervalidator.h index baf2260957e..6e0fd7199c8 100644 --- a/searchlib/src/vespa/searchlib/fef/parametervalidator.h +++ b/searchlib/src/vespa/searchlib/fef/parametervalidator.h @@ -43,7 +43,7 @@ public: Result & operator=(Result &&) = default; ~Result(); Result & addParameter(const Parameter & param) { _params.push_back(param); return *this; } - Result & setError(vespalib::stringref str) { + Result & setError(vespalib::stringref str) { _errorStr = str; _params.clear(); _valid = false; diff --git a/searchlib/src/vespa/searchlib/index/indexbuilder.h b/searchlib/src/vespa/searchlib/index/indexbuilder.h index 4c79e744da6..e5769ccdb75 100644 --- a/searchlib/src/vespa/searchlib/index/indexbuilder.h +++ b/searchlib/src/vespa/searchlib/index/indexbuilder.h @@ -24,7 +24,7 @@ public: ~IndexBuilder(); virtual void - startWord(vespalib::stringref word) = 0; + startWord(vespalib::stringref word) = 0; virtual void endWord() = 0; diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h index c4583d7f49f..5b4ab7eb4fd 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h +++ b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.h @@ -43,8 +43,8 @@ public: class KeyComp { private: - const WordStore &_wordStore; - const vespalib::stringref _word; + const WordStore &_wordStore; + const vespalib::stringref _word; const char * getWord(datastore::EntryRef wordRef) const diff --git a/searchlib/src/vespa/searchlib/query/queryterm.cpp b/searchlib/src/vespa/searchlib/query/queryterm.cpp index dc23f5f34c0..c48def1b24d 100644 --- a/searchlib/src/vespa/searchlib/query/queryterm.cpp +++ b/searchlib/src/vespa/searchlib/query/queryterm.cpp @@ -348,7 +348,7 @@ QueryTermSimple::~QueryTermSimple() = default; namespace { -bool isFullRange(vespalib::stringref s) { +bool isFullRange(vespalib::stringref s) { const size_t sz(s.size()); return (sz >= 3u) && (s[0] == '<' || s[0] == '[') && diff --git a/slobrok/src/vespa/slobrok/sbregister.cpp b/slobrok/src/vespa/slobrok/sbregister.cpp index 2d742e063ee..8f8e42a39aa 100644 --- a/slobrok/src/vespa/slobrok/sbregister.cpp +++ b/slobrok/src/vespa/slobrok/sbregister.cpp @@ -94,7 +94,7 @@ RegisterAPI::~RegisterAPI() void -RegisterAPI::registerName(vespalib::stringref name) +RegisterAPI::registerName(vespalib::stringref name) { std::lock_guard<std::mutex> guard(_lock); for (uint32_t i = 0; i < _names.size(); ++i) { @@ -111,7 +111,7 @@ RegisterAPI::registerName(vespalib::stringref name) void -RegisterAPI::unregisterName(vespalib::stringref name) +RegisterAPI::unregisterName(vespalib::stringref name) { std::lock_guard<std::mutex> guard(_lock); _busy = true; diff --git a/slobrok/src/vespa/slobrok/sbregister.h b/slobrok/src/vespa/slobrok/sbregister.h index b910131a19a..234e6c076d4 100644 --- a/slobrok/src/vespa/slobrok/sbregister.h +++ b/slobrok/src/vespa/slobrok/sbregister.h @@ -40,13 +40,13 @@ public: * @brief Register a service with the slobrok cluster. * @param name service name to register **/ - void registerName(vespalib::stringref name); + void registerName(vespalib::stringref name); /** * @brief Unregister a service with the slobrok cluster * @param name service name to unregister **/ - void unregisterName(vespalib::stringref name); + void unregisterName(vespalib::stringref name); /** * @brief Check progress diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp index 5276e5c7eb9..57e88873e81 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp @@ -69,7 +69,7 @@ GrowableByteBuffer::putDouble(double v) } void -GrowableByteBuffer::putString(vespalib::stringref v) +GrowableByteBuffer::putString(vespalib::stringref v) { putInt(v.size()); putBytes(v.data(), v.size()); diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h index d65cabd8cb7..beb7e93d343 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h +++ b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h @@ -70,7 +70,7 @@ public: /** Adds a string to the buffer. */ - void putString(vespalib::stringref v); + void putString(vespalib::stringref v); /** Adds a single byte to the buffer. diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp index 010b9f57a33..71017e28c4c 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp @@ -173,7 +173,7 @@ JSONWriter::appendNull() } JSONWriter & -JSONWriter::appendKey(stringref str) +JSONWriter::appendKey(stringref str) { considerComma(); indent(); @@ -243,7 +243,7 @@ JSONWriter::appendUInt64(uint64_t v) } JSONWriter & -JSONWriter::appendString(stringref str) +JSONWriter::appendString(stringref str) { considerComma(); quote(str.data(), str.size()); @@ -252,7 +252,7 @@ JSONWriter::appendString(stringref str) } JSONWriter & -JSONWriter::appendJSON(stringref json) +JSONWriter::appendJSON(stringref json) { considerComma(); (*_os) << json; diff --git a/staging_vespalib/src/vespa/vespalib/util/librarypool.h b/staging_vespalib/src/vespa/vespalib/util/librarypool.h index f6afeb23e69..f9149589338 100644 --- a/staging_vespalib/src/vespa/vespalib/util/librarypool.h +++ b/staging_vespalib/src/vespa/vespalib/util/librarypool.h @@ -20,14 +20,14 @@ public: * @param name The name of the library to load. That is without the 'lib' prefix and the '.so' extension. * @throws IllegalArgumentException if there are any errors. */ - void loadLibrary(stringref name); + void loadLibrary(stringref name); /** * Will return the library requested. NULL if not found. * @param name The name of the library as given in the @ref loadLibrary call. * @return The library that has already been loaded. NULL if not found. */ - FastOS_DynamicLibrary *get(stringref name); - const FastOS_DynamicLibrary *get(stringref name) const; + FastOS_DynamicLibrary *get(stringref name); + const FastOS_DynamicLibrary *get(stringref name) const; private: typedef std::shared_ptr<FastOS_DynamicLibrary> DynamicLibrarySP; typedef std::map<vespalib::string, DynamicLibrarySP> LibraryMap; diff --git a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp index 3dc23d8236b..aa985f282f1 100644 --- a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp +++ b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.cpp @@ -30,7 +30,7 @@ vespalib::string stripWhitespace(const vespalib::string& s) { return s.substr(start, stop - start + 1); } -vespalib::string getLine(vespalib::stringref key, +vespalib::string getLine(vespalib::stringref key, vespalib::stringref content) { vespalib::string::size_type start(0); @@ -63,7 +63,7 @@ uint32_t getTokenCount(const vespalib::string& line) { return st.size(); } -uint64_t toLong(vespalib::stringref s, int base) { +uint64_t toLong(vespalib::stringref s, int base) { char* endptr; // FIXME C++17 range-safe from_chars() instead of strtoull() uint64_t result(strtoull(s.data(), &endptr, base)); diff --git a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h index ec7cff41d9a..80a2b2738bc 100644 --- a/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h +++ b/storage/src/vespa/storage/common/hostreporter/kernelmetrictool.h @@ -15,14 +15,14 @@ vespalib::string readFile(const char* fileName); vespalib::string stripWhitespace(const vespalib::string& s); -vespalib::string getLine(vespalib::stringref key, +vespalib::string getLine(vespalib::stringref key, vespalib::stringref content); vespalib::string getToken(uint32_t index, const vespalib::string& line); uint32_t getTokenCount(const vespalib::string& line); -uint64_t toLong(vespalib::stringref s, int base = 0) ; +uint64_t toLong(vespalib::stringref s, int base = 0) ; } /* namespace kernelmetrictool */ } /* namespace storage */ diff --git a/storage/src/vespa/storage/config/distributorconfiguration.h b/storage/src/vespa/storage/config/distributorconfiguration.h index 8c2e0568796..5dfc4f66cb8 100644 --- a/storage/src/vespa/storage/config/distributorconfiguration.h +++ b/storage/src/vespa/storage/config/distributorconfiguration.h @@ -70,11 +70,11 @@ public: _lastGarbageCollectionChange = lastChangeTime; } - bool stateCheckerIsActive(vespalib::stringref stateCheckerName) const { + bool stateCheckerIsActive(vespalib::stringref stateCheckerName) const { return _blockedStateCheckers.find(stateCheckerName) == _blockedStateCheckers.end(); } - void disableStateChecker(vespalib::stringref stateCheckerName) { + void disableStateChecker(vespalib::stringref stateCheckerName) { _blockedStateCheckers.insert(stateCheckerName); } diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.cpp b/storage/src/vespa/storage/storageserver/fnetlistener.cpp index d92b672c52a..1a72190b2a6 100644 --- a/storage/src/vespa/storage/storageserver/fnetlistener.cpp +++ b/storage/src/vespa/storage/storageserver/fnetlistener.cpp @@ -43,7 +43,7 @@ FNetListener::getListenPort() const } void -FNetListener::registerHandle(vespalib::stringref handle) { +FNetListener::registerHandle(vespalib::stringref handle) { _slobrokRegister.registerName(handle); while (_slobrokRegister.busy()) { LOG(debug, "Waiting to register in slobrok"); diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.h b/storage/src/vespa/storage/storageserver/fnetlistener.h index 2ffdae24b29..abcba18e0be 100644 --- a/storage/src/vespa/storage/storageserver/fnetlistener.h +++ b/storage/src/vespa/storage/storageserver/fnetlistener.h @@ -27,7 +27,7 @@ public: void RPC_getCurrentTime(FRT_RPCRequest *req); void RPC_setDistributionStates(FRT_RPCRequest* req); - void registerHandle(vespalib::stringref handle); + void registerHandle(vespalib::stringref handle); void close(); int getListenPort() const; diff --git a/storage/src/vespa/storage/visiting/visitorthread.cpp b/storage/src/vespa/storage/visiting/visitorthread.cpp index f0374e07ef7..d5b56c3ee53 100644 --- a/storage/src/vespa/storage/visiting/visitorthread.cpp +++ b/storage/src/vespa/storage/visiting/visitorthread.cpp @@ -365,7 +365,7 @@ VisitorThread::handleNonExistingVisitorCall(const Event& entry, * Utility function to get a visitor instance from a given library. */ std::shared_ptr<Visitor> -VisitorThread::createVisitor(vespalib::stringref libName, +VisitorThread::createVisitor(vespalib::stringref libName, const vdslib::Parameters& params, vespalib::asciistream & error) { diff --git a/storage/src/vespa/storage/visiting/visitorthread.h b/storage/src/vespa/storage/visiting/visitorthread.h index 483837ed741..a9dcd8f5806 100644 --- a/storage/src/vespa/storage/visiting/visitorthread.h +++ b/storage/src/vespa/storage/visiting/visitorthread.h @@ -125,7 +125,7 @@ private: void trimRecentlyCompletedList(framework::SecondTime currentTime); void handleNonExistingVisitorCall(const Event& entry, api::ReturnCode& code); - std::shared_ptr<Visitor> createVisitor(vespalib::stringref libName, + std::shared_ptr<Visitor> createVisitor(vespalib::stringref libName, const vdslib::Parameters& params, vespalib::asciistream & error); |