diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-15 14:45:44 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-15 14:45:44 +0200 |
commit | d2192e731c8586bf8863cc9c3dcdd9cc8ec780b3 (patch) | |
tree | ad4258afa1b33cd74b03b69175ae5a3b70cb545a /searchsummary | |
parent | a3e571660a656fbed65c1b3f57a6b9b4f8a57f04 (diff) |
Correct include order
Diffstat (limited to 'searchsummary')
9 files changed, 25 insertions, 65 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h index 83459c0c7d9..abce5c12227 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h @@ -2,16 +2,14 @@ #pragma once +#include "urlresult.h" +#include "resultconfig.h" #include <vespa/searchlib/util/rawbuf.h> -#include <vespa/searchsummary/docsummary/urlresult.h> -#include <vespa/searchsummary/docsummary/resultconfig.h> #include <vespa/vespalib/data/slime/inserter.h> -namespace search { +namespace search { class IAttributeManager; } -class IAttributeManager; - -namespace docsummary { +namespace search::docsummary { class GetDocsumsState; @@ -94,6 +92,4 @@ public: static IDocsumFieldWriter *create(IAttributeManager & vecMan, const char *vecName); }; -} // namespace docsummary -} // namespace search - +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h index 6f88baee117..4b3e27799fe 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h @@ -6,9 +6,7 @@ #include "docsumstorevalue.h" -namespace search { -namespace docsummary { - +namespace search::docsummary { /** * Interface for object able to fetch docsum blobs based on local @@ -49,5 +47,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstorevalue.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstorevalue.h index ed9afd095ce..a15fb6d8892 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstorevalue.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstorevalue.h @@ -4,8 +4,7 @@ #include <cstdint> #include <utility> -namespace search { -namespace docsummary { +namespace search::docsummary { /** * Simple wrapper class containing the location and size of a docsum @@ -59,5 +58,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h index 0d384143c65..46caa26e60b 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h @@ -1,23 +1,20 @@ // Copyright 2017 Yahoo Holdings. 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 #pragma once +#include "juniperproperties.h" +#include "urlresult.h" +#include "resultconfig.h" +#include "docsumstore.h" +#include "keywordextractor.h" +#include "docsumfieldwriter.h" #include <vespa/searchlib/util/rawbuf.h> -#include <vespa/searchsummary/docsummary/urlresult.h> -#include <vespa/searchsummary/docsummary/resultconfig.h> -#include <vespa/searchsummary/docsummary/docsumstore.h> -#include <vespa/searchsummary/docsummary/keywordextractor.h> -#include <vespa/searchsummary/docsummary/docsumfieldwriter.h> #include <vespa/fastlib/text/unicodeutil.h> #include <vespa/fastlib/text/wordfolder.h> -#include "juniperproperties.h" using search::IAttributeManager; -namespace search { -namespace docsummary { +namespace search::docsummary { class IDocsumWriter { @@ -112,5 +109,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h index 114ddb6cc9d..cf4eca6b6a7 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h @@ -1,13 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/juniper/IJuniperProperties.h> #include <map> -#include <vespa/searchsummary/config/config-juniperrc.h> -#include <string> -namespace search { -namespace docsummary { +namespace search::docsummary { class JuniperProperties : public IJuniperProperties { private: @@ -65,6 +63,4 @@ public: void SetProperty(const vespalib::string &key, const vespalib::string &val); }; -} // namespace docsummary -} // namespace search - +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h index dad824dbe04..3b6779f6c52 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h @@ -7,8 +7,7 @@ #include <vespa/vespalib/stllike/hash_set.h> #include <vespa/searchlib/util/rawbuf.h> -namespace search { -namespace docsummary { +namespace search::docsummary { class IDocsumEnvironment; @@ -140,5 +139,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h index 462fc382493..d1504ed5bdd 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h @@ -1,6 +1,4 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 2001-2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS #pragma once @@ -9,8 +7,7 @@ #include <vespa/vespalib/stllike/hash_map.h> #include <vespa/searchlib/util/stringenum.h> -namespace search { -namespace docsummary { +namespace search::docsummary { /** * This enumeration contains values denoting the different types of @@ -286,7 +283,4 @@ public: } }; - -} } - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h index 8d2c5f94cf1..eac6d4b113f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h @@ -1,17 +1,14 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 2001-2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS #pragma once +#include "resultclass.h" +#include "urlresult.h" #include <vespa/config-summary.h> #include <vespa/searchlib/util/rawbuf.h> #include <vespa/searchlib/util/stringenum.h> -#include <vespa/searchsummary/docsummary/resultclass.h> -#include <vespa/searchsummary/docsummary/urlresult.h> -namespace search { -namespace docsummary { +namespace search::docsummary { /** * This class represents the overall result configuration. A result @@ -298,5 +295,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h index b076f82e440..97e31e47996 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h @@ -1,14 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 2001-2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS #pragma once -#include <vespa/searchsummary/docsummary/resultclass.h> -#include <vespa/searchsummary/docsummary/docsumstorevalue.h> +#include "resultclass.h" +#include "docsumstorevalue.h" -namespace search { -namespace docsummary { +namespace search::docsummary { class urlresult { @@ -85,6 +82,3 @@ public: }; } -} - - |