- NULL -> nullptr

- forward declaration.
- Move from header to implementation.
- use std::unordered_set

2 files changed, 3 insertions, 12 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
index 4f54c0c5bac..42e1c07f3e8 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
@@ -4,7 +4,6 @@
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 #include <vespa/messagebus/routing/verbatimdirective.h>
 #include <vespa/messagebus/messagebus.h>
-#include <vespa/vespalib/util/hashmap.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".localservicepolicy");
@@ -16,7 +15,6 @@ LocalServicePolicy::CacheEntry::CacheEntry() :
     _generation(0),
     _recipients()
 {
-    // empty
 }
 
 LocalServicePolicy::LocalServicePolicy(const string &param) :
@@ -24,13 +22,9 @@ LocalServicePolicy::LocalServicePolicy(const string &param) :
     _address(param),
     _cache()
 {
-    // empty
 }
 
-LocalServicePolicy::~LocalServicePolicy()
-{
-    // empty
-}
+LocalServicePolicy::~LocalServicePolicy() = default;
 
 void
 LocalServicePolicy::select(mbus::RoutingContext &ctx)
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
index af7e2e67661..7e2d54f318f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
@@ -4,8 +4,8 @@
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 #include <vespa/messagebus/routing/verbatimdirective.h>
 #include <vespa/messagebus/messagebus.h>
-#include <vespa/vespalib/util/hashmap.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/vespalib/stllike/hash_fun.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".subsetservicepolicy");
 
@@ -37,10 +37,7 @@ SubsetServicePolicy::SubsetServicePolicy(const string &param) :
     }
 }
 
-SubsetServicePolicy::~SubsetServicePolicy()
-{
-    // empty
-}
+SubsetServicePolicy::~SubsetServicePolicy() = default;
 
 void
 SubsetServicePolicy::select(mbus::RoutingContext &context)