aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-03-05 06:07:56 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-03-05 12:17:01 +0000
commitd9a1b8be930da47e9c7b42ab44eecd29b385c170 (patch)
tree1792df3508a3bf77862942d022289941685ff506
parent289e76ca3e334dd3efab0880c00fd7582bdf9175 (diff)
= default and NULL ->nullptr
-rw-r--r--searchlib/src/vespa/searchlib/engine/searchrequest.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/searchlib/src/vespa/searchlib/engine/searchrequest.cpp b/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
index 7159c83716b..b558e07480d 100644
--- a/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
+++ b/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
@@ -17,20 +17,20 @@ SearchRequest::SearchRequest(const fastos::TimeStamp &start_time)
sessionId()
{ }
-SearchRequest::~SearchRequest() {}
+SearchRequest::~SearchRequest() = default;
void SearchRequest::Source::lazyDecode() const
{
- if ((_request.get() == NULL) && (_fs4Packet != NULL)) {
- _request.reset(new SearchRequest(_start));
+ if (!_request && (_fs4Packet != nullptr)) {
+ _request = std::make_unique<SearchRequest>(_start);
PacketConverter::toSearchRequest(*_fs4Packet, *_request);
_fs4Packet->Free();
- _fs4Packet = NULL;
+ _fs4Packet = nullptr;
}
}
SearchRequest::Source::~Source() {
- if (_fs4Packet != NULL) {
+ if (_fs4Packet != nullptr) {
_fs4Packet->Free();
}
}