diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-01 20:22:17 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-01 20:22:17 +0000 |
commit | 3386eb426e23d622afe037cce31932072d449c38 (patch) | |
tree | 5f22baabe9d26029ed8d2f8355cd341ff2b031e0 | |
parent | eec532266981a868d00a74e87526a70f092eb3d5 (diff) |
Use the get() api correctly. The value is returned.
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 4 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/container/parameters.cpp | 23 |
2 files changed, 4 insertions, 23 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 63972ca139d..d6c681e8f49 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -227,8 +227,8 @@ void SearchVisitor::init(const Parameters & params) LOG(debug, "Received rank profile: %s", _rankController.getRankProfile().c_str()); } - int queryFlags = 0; - if (params.get("queryflags", queryFlags)) { + int queryFlags = params.get("queryflags", 0); + if (queryFlags) { bool dumpFeatures = (queryFlags & QFLAG_DUMP_FEATURES) != 0; _summaryGenerator.getDocsumState()._args.dumpFeatures(dumpFeatures); _rankController.setDumpFeatures(dumpFeatures); diff --git a/vdslib/src/vespa/vdslib/container/parameters.cpp b/vdslib/src/vespa/vdslib/container/parameters.cpp index c830f89d5a9..4358c42ff29 100644 --- a/vdslib/src/vespa/vdslib/container/parameters.cpp +++ b/vdslib/src/vespa/vdslib/container/parameters.cpp @@ -9,7 +9,7 @@ using namespace vdslib; -Parameters::Parameters() : _parameters() { } +Parameters::Parameters() = default; Parameters::Parameters(const document::DocumentTypeRepo &repo, document::ByteBuffer& buffer) : _parameters() @@ -17,9 +17,7 @@ Parameters::Parameters(const document::DocumentTypeRepo &repo, document::ByteBuf deserialize(repo, buffer); } -Parameters::~Parameters() -{ -} +Parameters::~Parameters() = default; size_t Parameters::getSerializedSize() const { @@ -74,23 +72,6 @@ Parameters::printXml(document::XmlOutputStream& xos) const xos << XmlEndTag(); } -/* -void -Parameters::deserializeXml(const document::XmlElement & xml) -{ - ParametersMap params; - for(document::XmlElement::ElementList::const_iterator it = xml.elements().begin(), mt = xml.elements().end(); it != mt; it++) { - const document::XmlElement & elem = *it; - assert( elem.elements().size() == 2); - - const document::XmlElement & name = (*it).elements()[0]; - const document::XmlElement & value = (*it).elements()[1]; - params[name.value()] = Value(value.value().c_str(), value.value().size()); - } - _parameters.swap(params); -} -*/ - bool Parameters::operator==(const Parameters &other) const { |