diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-02 09:10:14 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-02 09:10:14 +0000 |
commit | 10a3ed1cd43054f9ffd644a29a95ed86c769ca35 (patch) | |
tree | 70ad2f7966fc1f32df41ed59294a86be1696b663 /searchsummary | |
parent | 07c9cae6d6cb55ec3f4ae0c11fa702d6b601c1ea (diff) |
Use braced initializers for return values, add 'explicit'
Diffstat (limited to 'searchsummary')
3 files changed, 16 insertions, 15 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp index 957f49c0f86..df5ce032acd 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp @@ -42,11 +42,10 @@ struct QueryItem search::SimpleQueryStackDumpIterator *_si; const ExplicitItemData *_data; QueryItem() : _si(nullptr), _data(nullptr) {} - QueryItem(search::SimpleQueryStackDumpIterator *si) : _si(si), _data(nullptr) {} - QueryItem(ExplicitItemData *data) : _si(nullptr), _data(data) {} -private: - QueryItem(const QueryItem&); - QueryItem& operator= (const QueryItem&); + explicit QueryItem(search::SimpleQueryStackDumpIterator *si) : _si(si), _data(nullptr) {} + explicit QueryItem(ExplicitItemData *data) : _si(nullptr), _data(data) {} + QueryItem(const QueryItem&) = delete; + QueryItem& operator= (const QueryItem&) = delete; }; } @@ -57,10 +56,11 @@ public: juniper::IQueryVisitor *_visitor; juniper::QueryItem _item; - TermVisitor(juniper::IQueryVisitor *visitor) : - _visitor(visitor), _item() {} - - virtual void visitProperty(const Property::Value &key, const Property &values) override; + explicit TermVisitor(juniper::IQueryVisitor *visitor) + : _visitor(visitor), + _item() + {} + void visitProperty(const Property::Value &key, const Property &values) override; }; @@ -303,7 +303,7 @@ JuniperDFW::Init( { bool rc = true; _juniperConfig = _juniper->CreateConfig(fieldName); - if (_juniperConfig.get() == nullptr) { + if ( ! _juniperConfig) { LOG(warning, "could not create juniper config for field '%s'", fieldName); rc = false; } @@ -365,9 +365,9 @@ DynamicTeaserDFW::makeDynamicTeaser(uint32_t docid, vespalib::stringref input, G } if (teaser != nullptr) { - return vespalib::string(teaser->Text(), teaser->Length()); + return {teaser->Text(), teaser->Length()}; } else { - return vespalib::string(); + return {}; } } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp index dc9de0c6f35..739a6fae548 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp @@ -16,7 +16,6 @@ GetDocsumArgs::GetDocsumArgs() _fields() { } - GetDocsumArgs::~GetDocsumArgs() = default; void diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h index e973c76253d..ff410fb298c 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h @@ -22,6 +22,8 @@ private: FieldSet _fields; public: GetDocsumArgs(); + GetDocsumArgs(const GetDocsumArgs &) = delete; + GetDocsumArgs & operator=(const GetDocsumArgs &) = delete; ~GetDocsumArgs(); void initFromDocsumRequest(const search::engine::DocsumRequest &req); @@ -36,8 +38,8 @@ public: vespalib::duration getTimeout() const { return _timeout; } const vespalib::string & getResultClassName() const { return _resultClassName; } - const vespalib::stringref getStackDump() const { - return vespalib::stringref(&_stackDump[0], _stackDump.size()); + vespalib::stringref getStackDump() const { + return {&_stackDump[0], _stackDump.size()}; } void dumpFeatures(bool v) { _dumpFeatures = v; } |