summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-10-12 12:10:43 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-10-12 14:19:46 +0200
commitdd53c99e70759ab6f5b4e77144a4c7aaa40e8438 (patch)
tree4a2e221408f96ec1ab575bbfea52b57f2c15c068 /searchcore
parent1516466389686330efa30d20bc7b9d06c1f286a7 (diff)
smartptr->get() != NULL -> (smartptr)
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
index be9e2e823a0..f89f32e5a74 100644
--- a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
@@ -19,19 +19,19 @@ FeedToken::State::State(ITransport & transport, mbus::Reply::UP reply, uint32_t
_lock(),
_startTime()
{
- assert(_reply.get() != NULL);
+ assert(_reply);
_startTime.SetNow();
}
FeedToken::State::~State()
{
- assert(_reply.get() == NULL);
+ assert(!_reply);
}
void
FeedToken::State::ack()
{
- assert(_reply.get() != NULL);
+ assert(_reply);
uint32_t prev(_unAckedCount--);
if (prev == 1) {
_transport.send(std::move(_reply), std::move(_result), _documentWasFound, _startTime.MilliSecsToNow());
@@ -44,7 +44,7 @@ void
FeedToken::State::ack(const FeedOperation::Type opType,
PerDocTypeFeedMetrics &metrics)
{
- assert(_reply.get() != NULL);
+ assert(_reply);
uint32_t prev(_unAckedCount--);
if (prev == 1) {
_transport.send(std::move(_reply), std::move(_result), _documentWasFound, _startTime.MilliSecsToNow());
@@ -74,7 +74,7 @@ FeedToken::State::ack(const FeedOperation::Type opType,
void
FeedToken::State::incNeededAcks()
{
- assert(_reply.get() != NULL);
+ assert(_reply);
uint32_t prev(_unAckedCount++);
assert(prev >= 1);
(void) prev;
@@ -84,7 +84,7 @@ FeedToken::State::incNeededAcks()
void
FeedToken::State::fail(uint32_t errNum, const vespalib::string &errMsg)
{
- assert(_reply.get() != NULL);
+ assert(_reply);
vespalib::LockGuard guard(_lock);
_reply->addError(mbus::Error(errNum, errMsg));
_transport.send(std::move(_reply), std::move(_result), _documentWasFound, _startTime.MilliSecsToNow());
@@ -93,7 +93,7 @@ FeedToken::State::fail(uint32_t errNum, const vespalib::string &errMsg)
void
FeedToken::State::trace(uint32_t traceLevel, const vespalib::string &traceMsg)
{
- assert(_reply.get() != NULL);
+ assert(_reply);
vespalib::LockGuard guard(_lock);
_reply->getTrace().trace(traceLevel, traceMsg);
}