Reserve space for vector.

Varoius code cleanup for c++11.

2 files changed, 18 insertions, 23 deletions

diff --git a/messagebus/src/vespa/messagebus/messagebus.cpp b/messagebus/src/vespa/messagebus/messagebus.cpp
index d277063a273..fee9504007b 100644
--- a/messagebus/src/vespa/messagebus/messagebus.cpp
+++ b/messagebus/src/vespa/messagebus/messagebus.cpp
@@ -99,7 +99,7 @@ MessageBus::MessageBus(INetwork &net, ProtocolSet protocols) :
     MessageBusParams params;
     while (!protocols.empty()) {
         IProtocol::SP protocol = protocols.extract();
-        if (protocol.get() != nullptr) {
+        if (protocol) {
             params.addProtocol(protocol);
         }
     }
@@ -132,8 +132,7 @@ MessageBus::~MessageBus()
     bool done = false;
     while (!done) {
         vespalib::Gate gate;
-        Messenger::ITask::UP task(new ShutdownTask(_network, *_msn, done, gate));
-        _msn->enqueue(std::move(task));
+        _msn->enqueue(std::make_unique<ShutdownTask>(_network, *_msn, done, gate));
         gate.await();
     }
 }
@@ -157,11 +156,10 @@ MessageBus::setup(const MessageBusParams &params)
 
     // Start messenger.
     IRetryPolicy::SP retryPolicy = params.getRetryPolicy();
-    if (retryPolicy.get() != nullptr) {
-        _resender.reset(new Resender(retryPolicy));
+    if (retryPolicy) {
+        _resender = std::make_unique<Resender>(retryPolicy);
 
-        Messenger::ITask::UP task(new ResenderTask(*_resender));
-        _msn->addRecurrentTask(std::move(task));
+        _msn->addRecurrentTask(std::make_unique<ResenderTask>(*_resender));
     }
     if (!_msn->start()) {
         throw vespalib::NetworkSetupFailureException("Failed to start messenger.");
@@ -273,7 +271,7 @@ MessageBus::sync()
 void
 MessageBus::handleMessage(Message::UP msg)
 {
-    if (_resender.get() != nullptr && msg->hasBucketSequence()) {
+    if (_resender && msg->hasBucketSequence()) {
         deliverError(std::move(msg), ErrorCode::SEQUENCE_ERROR,
                      "Bucket sequences not supported when resender is enabled.");
         return;
@@ -292,8 +290,7 @@ MessageBus::setupRouting(const RoutingSpec &spec)
             LOG(info, "Protocol '%s' is not supported, ignoring routing table.", cfg.getProtocol().c_str());
             continue;
         }
-        RoutingTable::SP rt(new RoutingTable(cfg));
-        rtm[cfg.getProtocol()] = rt;
+        rtm[cfg.getProtocol()] = std::make_shared<RoutingTable>(cfg);
     }
     {
         LockGuard guard(_lock);
@@ -383,7 +380,7 @@ MessageBus::deliverMessage(Message::UP msg, const string &session)
 void
 MessageBus::deliverError(Message::UP msg, uint32_t errCode, const string &errMsg)
 {
-    Reply::UP reply(new EmptyReply());
+    auto reply = std::make_unique<EmptyReply>();
     reply->swapState(*msg);
     reply->addError(Error(errCode, errMsg));
 
diff --git a/messagebus/src/vespa/messagebus/messenger.cpp b/messagebus/src/vespa/messagebus/messenger.cpp
index 63df7f2f482..5313c4adcbb 100644
--- a/messagebus/src/vespa/messagebus/messenger.cpp
+++ b/messagebus/src/vespa/messagebus/messenger.cpp
@@ -33,7 +33,7 @@ public:
     }
 
     ~MessageTask() {
-        if (_msg.get() != nullptr) {
+        if (_msg) {
             _msg->discard();
         }
     }
@@ -43,7 +43,7 @@ public:
     }
 
     uint8_t priority() const override {
-        if (_msg.get() != nullptr) {
+        if (_msg) {
             return _msg->priority();
         }
 
@@ -65,7 +65,7 @@ public:
     }
 
     ~ReplyTask() {
-        if (_reply.get() != nullptr) {
+        if (_reply) {
             _reply->discard();
         }
     }
@@ -75,7 +75,7 @@ public:
     }
 
     uint8_t priority() const override {
-        if (_reply.get() != nullptr) {
+        if (_reply) {
             return _reply->priority();
         }
 
@@ -206,7 +206,7 @@ Messenger::Run(FastOS_ThreadInterface *thread, void *arg)
                 _queue.pop();
             }
         }
-        if (task.get() != nullptr) {
+        if (task) {
             try {
                 task->run();
             } catch (const std::exception &e) {
@@ -223,16 +223,14 @@ Messenger::Run(FastOS_ThreadInterface *thread, void *arg)
 void
 Messenger::addRecurrentTask(ITask::UP task)
 {
-    ITask::UP add(new AddRecurrentTask(_children, std::move(task)));
-    enqueue(std::move(add));
+    enqueue(std::make_unique<AddRecurrentTask>(_children, std::move(task)));
 }
 
 void
 Messenger::discardRecurrentTasks()
 {
     vespalib::Gate gate;
-    ITask::UP task(new DiscardRecurrentTasks(gate, _children));
-    enqueue(std::move(task));
+    enqueue(std::make_unique<DiscardRecurrentTasks>(gate, _children));
     gate.await();
 }
 
@@ -248,13 +246,13 @@ Messenger::start()
 void
 Messenger::deliverMessage(Message::UP msg, IMessageHandler &handler)
 {
-    enqueue(ITask::UP(new MessageTask(std::move(msg), handler)));
+    enqueue(std::make_unique<MessageTask>(std::move(msg), handler));
 }
 
 void
 Messenger::deliverReply(Reply::UP reply, IReplyHandler &handler)
 {
-    enqueue(ITask::UP(new ReplyTask(std::move(reply), handler)));
+    enqueue(std::make_unique<ReplyTask>(std::move(reply), handler));
 }
 
 void
@@ -273,7 +271,7 @@ void
 Messenger::sync()
 {
     vespalib::Gate gate;
-    enqueue(ITask::UP(new SyncTask(gate)));
+    enqueue(std::make_unique<SyncTask>(gate));
     gate.await();
 }