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

3 files changed, 14 insertions, 28 deletions

diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
index 1316a370a7c..782d06468f9 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.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.
-// Copyright (C) 1998-2003 Fast Search & Transfer ASA
-// Copyright (C) 2003 Overture Services Norway AS
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/searchsummary/docsummary/getdocsumargs.h>
-#include <vespa/searchsummary/docsummary/resultconfig.h>
+#include "getdocsumargs.h"
+#include "resultconfig.h"
 
 namespace search {
 namespace docsummary {
@@ -20,13 +17,10 @@ GetDocsumArgs::GetDocsumArgs()
       _flags(0u),
       _propertiesMap(),
       _isLocationSet(false)
-{
-}
+{ }
 
 
-GetDocsumArgs::~GetDocsumArgs()
-{
-}
+GetDocsumArgs::~GetDocsumArgs() { }
 
 void
 GetDocsumArgs::setTimeout(const fastos::TimeStamp & timeout)
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp
index 19d8baccf45..e6420043929 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp
@@ -2,15 +2,13 @@
 // Copyright (C) 1998-2003 Fast Search & Transfer ASA
 // Copyright (C) 2003 Overture Services Norway AS
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-#include <vespa/fnet/frt/frt.h>
-#include <vespa/searchsummary/docsummary/resultclass.h>
-#include <vespa/searchsummary/docsummary/resultconfig.h>
 
-#include <zlib.h>
+#include "resultclass.h"
+#include "resultconfig.h"
+
+#include <vespa/vespalib/stllike/hash_map.hpp>
 
-LOG_SETUP(".searchlib.docsummary.resultclass");
+#include <zlib.h>
 
 namespace search {
 namespace docsummary {
@@ -23,13 +21,10 @@ ResultClass::ResultClass(const char *name, uint32_t id, util::StringEnum & field
       _fieldEnum(fieldEnum),
       _enumMap(),
       _dynInfo(NULL)
-{
-}
+{ }
 
 
-ResultClass::~ResultClass()
-{
-}
+ResultClass::~ResultClass() { }
 
 
 bool
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp
index de635d14854..a08b0d11d5e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp
@@ -1,13 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Copyright (C) 1998-2003 Fast Search & Transfer ASA
-// Copyright (C) 2003 Overture Services Norway AS
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-#include <vespa/searchsummary/docsummary/resultconfig.h>
-#include <vespa/searchsummary/docsummary/urlresult.h>
+#include "resultconfig.h"
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/stllike/hash_map.hpp>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.resultconfig");
 
 namespace search {