summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-08-15 08:53:44 +0200
committerHenning Baldersheim <balder@oath.com>2018-08-15 08:53:44 +0200
commit93fa7a7483e3211019aa62f118aaab9692f15444 (patch)
tree5ed2b6958b12dc071c368e8c080897b30af376e0 /searchlib
parent451216956ce459f517f0712edf27958d693b7483 (diff)
= default
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributecontext.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/common/resultset.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributecontext.cpp b/searchlib/src/vespa/searchlib/attribute/attributecontext.cpp
index df8e7858f5f..6d7d90844bc 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributecontext.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributecontext.cpp
@@ -38,7 +38,7 @@ AttributeContext::AttributeContext(const IAttributeManager & manager) :
_cacheLock()
{ }
-AttributeContext::~AttributeContext() { }
+AttributeContext::~AttributeContext() = default;
const IAttributeVector *
AttributeContext::getAttribute(const string & name) const
diff --git a/searchlib/src/vespa/searchlib/common/resultset.h b/searchlib/src/vespa/searchlib/common/resultset.h
index c647ed82238..60c902b1b12 100644
--- a/searchlib/src/vespa/searchlib/common/resultset.h
+++ b/searchlib/src/vespa/searchlib/common/resultset.h
@@ -41,7 +41,7 @@ public:
void mergeWithBitOverflow(HitRank default_value = default_rank_value);
/* isEmpty() is allowed to return false even if bitmap has no hits */
- bool isEmpty() const { return (_bitOverflow == NULL && _elemsUsedInRankedHitsArray == 0); }
+ bool isEmpty() const { return (_bitOverflow && (_elemsUsedInRankedHitsArray == 0)); }
};
} // namespace search