aboutsummaryrefslogtreecommitdiffstats
path: root/searchsummary
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-07-24 16:04:17 +0200
committerHenning Baldersheim <balder@oath.com>2018-07-24 16:04:17 +0200
commit06b91e4cd4003e62e832776407d50a043b5aefd4 (patch)
tree7c84c1d703d917116cd95463eb2ef7d2b205de6f /searchsummary
parent77025a2bd8a68288012d2e0248a92d938b3f871e (diff)
- NULL -> nullptr
- nested namespaces - = default;
Diffstat (limited to 'searchsummary')
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
index fdc38d8d6f9..7097012c5ea 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
@@ -8,10 +8,10 @@
namespace search::docsummary {
RankFeaturesDFW::RankFeaturesDFW() :
- _env(NULL)
+ _env(nullptr)
{ }
-RankFeaturesDFW::~RankFeaturesDFW() { }
+RankFeaturesDFW::~RankFeaturesDFW() = default;
void
RankFeaturesDFW::init(IDocsumEnvironment * env)
@@ -23,15 +23,15 @@ void
RankFeaturesDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState *state,
ResType type, vespalib::slime::Inserter &target)
{
- if (state->_rankFeatures.get() == NULL) {
+ if (state->_rankFeatures.get() == nullptr) {
state->_callback.FillRankFeatures(state, _env);
- if (state->_rankFeatures.get() == NULL) { // still no rank features to write
+ if (state->_rankFeatures.get() == nullptr) { // still no rank features to write
return;
}
}
const FeatureSet::StringVector & names = state->_rankFeatures->getNames();
const feature_t * values = state->_rankFeatures->getFeaturesByDocId(docid);
- if (type == RES_FEATUREDATA && values != NULL) {
+ if (type == RES_FEATUREDATA && values != nullptr) {
vespalib::slime::Cursor& obj = target.insertObject();
for (uint32_t i = 0; i < names.size(); ++i) {
vespalib::Memory name(names[i].c_str(), names[i].size());
@@ -40,7 +40,7 @@ RankFeaturesDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState *s
return;
}
vespalib::JSONStringer & json(state->_jsonStringer);
- if (values != NULL) {
+ if (values != nullptr) {
json.clear();
json.beginObject();
for (uint32_t i = 0; i < names.size(); ++i) {