Split in hash_xxx, array, lru, cache ++ in hpp files. To reduce clinon build

3 files changed, 13 insertions, 13 deletions

diff --git a/storageapi/src/vespa/storageapi/message/bucket.cpp b/storageapi/src/vespa/storageapi/message/bucket.cpp
index 7b74d17ada1..341a11ba5ee 100644
--- a/storageapi/src/vespa/storageapi/message/bucket.cpp
+++ b/storageapi/src/vespa/storageapi/message/bucket.cpp
@@ -2,6 +2,7 @@
 #include "bucket.h"
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/util/array.hpp>
 
 
 namespace storage {
@@ -27,8 +28,7 @@ IMPLEMENT_REPLY(SetBucketStateReply)
 CreateBucketCommand::CreateBucketCommand(const document::BucketId& id)
     : MaintenanceCommand(MessageType::CREATEBUCKET, id),
       _active(false)
-{
-}
+{ }
 
 void
 CreateBucketCommand::print(std::ostream& out, bool verbose,
@@ -66,8 +66,7 @@ CreateBucketReply::print(std::ostream& out, bool verbose,
 
 DeleteBucketCommand::DeleteBucketCommand(const document::BucketId& id)
     : MaintenanceCommand(MessageType::DELETEBUCKET, id)
-{
-}
+{ }
 
 void
 DeleteBucketCommand::print(std::ostream& out, bool verbose,
@@ -496,8 +495,9 @@ RequestBucketInfoReply::RequestBucketInfoReply(
         const RequestBucketInfoCommand& cmd)
     : StorageReply(cmd),
       _buckets()
-{
-}
+{ }
+
+RequestBucketInfoReply::~RequestBucketInfoReply() { }
 
 uint32_t
 RequestBucketInfoReply::getMemoryFootprint() const
@@ -618,3 +618,5 @@ SetBucketStateReply::print(std::ostream& out,
 
 } // api
 } // storage
+
+template class vespalib::Array<storage::api::RequestBucketInfoReply::Entry>;
diff --git a/storageapi/src/vespa/storageapi/message/bucket.h b/storageapi/src/vespa/storageapi/message/bucket.h
index 7f5ba157d3d..d5c4584fe4e 100644
--- a/storageapi/src/vespa/storageapi/message/bucket.h
+++ b/storageapi/src/vespa/storageapi/message/bucket.h
@@ -400,8 +400,8 @@ public:
         document::BucketId _bucketId;
         BucketInfo _info;
 
-        bool operator==(const Entry& e) const
-            { return (_bucketId == e._bucketId && _info == e._info); }
+        bool operator==(const Entry& e) const { return (_bucketId == e._bucketId && _info == e._info); }
+        bool operator!=(const Entry& e) const { return !(*this == e); }
         Entry() : _bucketId(), _info() {}
         Entry(const document::BucketId& id, const BucketInfo& info)
             : _bucketId(id), _info(info) {}
@@ -414,6 +414,7 @@ private:
 public:
 
     explicit RequestBucketInfoReply(const RequestBucketInfoCommand& cmd);
+    ~RequestBucketInfoReply();
 
     const EntryVector & getBucketInfo() const { return _buckets; }
     EntryVector & getBucketInfo() { return _buckets; }
diff --git a/storageapi/src/vespa/storageapi/message/visitor.cpp b/storageapi/src/vespa/storageapi/message/visitor.cpp
index 3dee0e2e4fb..9d2ec3624e8 100644
--- a/storageapi/src/vespa/storageapi/message/visitor.cpp
+++ b/storageapi/src/vespa/storageapi/message/visitor.cpp
@@ -1,10 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-/* $Id$ */
-
-
-#include <vespa/fastos/fastos.h>
-#include <vespa/storageapi/message/visitor.h>
+#include "visitor.h"
+#include <vespa/vespalib/util/array.hpp>
 
 namespace storage {
 namespace api {