Reserve space for vector.

Varoius code cleanup for c++11.

2 files changed, 6 insertions, 8 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
index a2e8219e916..01b8515400b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
@@ -23,9 +23,9 @@ const mbus::string DocumentProtocol::NAME = "document";
 DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes,
                                    std::shared_ptr<const DocumentTypeRepo> repo,
                                    const string &configId) :
-    _routingPolicyRepository(new RoutingPolicyRepository()),
-    _routableRepository(new RoutableRepository(loadTypes)),
-    _repo(repo)
+    _routingPolicyRepository(std::make_unique<RoutingPolicyRepository>()),
+    _routableRepository(std::make_unique<RoutableRepository>(loadTypes)),
+    _repo(std::move(repo))
 {
     // Prepare config string for routing policy factories.
     string cfg = (configId.empty() ? "client" : configId);
@@ -148,10 +148,8 @@ DocumentProtocol &
 DocumentProtocol::putRoutableFactory(uint32_t type, IRoutableFactory::SP factory,
                                      const std::vector<vespalib::VersionSpecification> &versions)
 {
-    for (std::vector<vespalib::VersionSpecification>::const_iterator it = versions.begin();
-         it != versions.end(); ++it)
-    {
-        putRoutableFactory(type, factory, *it);
+    for (const auto & version : versions) {
+        putRoutableFactory(type, factory, version);
     }
     return *this;
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
index 5582c0ea153..eeae4553b3b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
+++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
@@ -197,7 +197,7 @@ public:
     DocumentProtocol(const LoadTypeSet& loadTypes,
                      std::shared_ptr<const document::DocumentTypeRepo> repo,
                      const string &configId = "");
-    ~DocumentProtocol();
+    ~DocumentProtocol() override;
 
     /**
      * Adds a new routable factory to this protocol. This method is thread-safe, and may be invoked on a