Use std::move and move constructors where benefiscal.

1 files changed, 8 insertions, 12 deletions

diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp
index ee6b908020c..5a8e822f30c 100644
--- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp
+++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp
@@ -237,25 +237,21 @@ createAddress(const vespalib::stringref & cluster, const lib::NodeType& type, ui
     return os.str();
 }
 
-StorageMessageAddress::StorageMessageAddress(
-        const vespalib::stringref & cluster, const lib::NodeType& type,
-        uint16_t index, Protocol protocol)
-    : _retryEnabled(false),
+StorageMessageAddress::StorageMessageAddress(const vespalib::stringref & cluster, const lib::NodeType& type,
+                                             uint16_t index, Protocol protocol)
+    : _route(),
+      _retryEnabled(false),
       _protocol(protocol),
       _cluster(cluster),
       _type(&type),
       _index(index)
 {
-    mbus::IHopDirective::SP directive(new mbus::VerbatimDirective(
-                                              createAddress(cluster, type, index)));
-
     std::vector<mbus::IHopDirective::SP> directives;
-    directives.push_back(directive);
-    mbus::Hop hop(directives, false);
-    _route.addHop(hop);
+    directives.emplace_back(std::make_shared<mbus::VerbatimDirective>(createAddress(cluster, type, index)));
+    _route.addHop(mbus::Hop(std::move(directives), false));
 }
 
-StorageMessageAddress::~StorageMessageAddress() { }
+StorageMessageAddress::~StorageMessageAddress() = default;
 
 uint16_t
 StorageMessageAddress::getIndex() const
@@ -332,7 +328,7 @@ StorageMessageAddress::print(vespalib::asciistream & out) const
     }
 }
 
-TransportContext::~TransportContext() { }
+TransportContext::~TransportContext() = default;
 
 StorageMessage::Id StorageMessage::_lastMsgId = 1000;