diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-29 05:50:42 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-29 05:56:35 +0000 |
commit | 3a7b0ab4ce0d5f94268f4c1284ae831f2de40584 (patch) | |
tree | cafbf72bf1a946fba11c07a5fc606fee8989a231 /searchlib/src | |
parent | 7f7422ccd9fd411c3911fe09127a56d187e856f9 (diff) |
Include only what is needed.
Diffstat (limited to 'searchlib/src')
6 files changed, 6 insertions, 17 deletions
diff --git a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp index 4240d68a0f0..4076194542a 100644 --- a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp +++ b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp @@ -19,6 +19,7 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/compress.h> #include <vespa/vespalib/util/stringfmt.h> +#include <set> #include <vespa/log/log.h> LOG_SETUP("searchcontext_test"); diff --git a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp index ce841fefd99..5aabad6fa02 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp @@ -9,6 +9,7 @@ #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/util/exceptions.h> #include <condition_variable> +#include <set> #include <vespa/log/log.h> LOG_SETUP(".searchlib.attributemanager"); diff --git a/searchlib/src/vespa/searchlib/attribute/i_enum_store.h b/searchlib/src/vespa/searchlib/attribute/i_enum_store.h index 958e61f6370..1f3165828bc 100644 --- a/searchlib/src/vespa/searchlib/attribute/i_enum_store.h +++ b/searchlib/src/vespa/searchlib/attribute/i_enum_store.h @@ -4,14 +4,9 @@ #include "enum_store_loaders.h" #include "enum_store_types.h" -#include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/vespalib/datastore/entryref.h> #include <vespa/vespalib/datastore/unique_store_enumerator.h> -#include <vespa/vespalib/stllike/hash_map.h> -#include <vespa/vespalib/util/array.h> #include <vespa/vespalib/util/memoryusage.h> -#include <cassert> -#include <set> namespace vespalib::datastore { diff --git a/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h b/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h index 44144a76aaf..b31e726b103 100644 --- a/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h +++ b/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h @@ -8,11 +8,7 @@ #include <cassert> #include <limits> -namespace search -{ - -namespace attribute -{ +namespace search::attribute { /** * Temporary representation of enumerated attribute loaded from enumerated @@ -144,10 +140,6 @@ public: } }; -void -sortLoadedByEnum(LoadedEnumAttributeVector &loaded); - -} // namespace attribute - -} // namespace search +void sortLoadedByEnum(LoadedEnumAttributeVector &loaded); +} diff --git a/searchlib/src/vespa/searchlib/attribute/numericbase.h b/searchlib/src/vespa/searchlib/attribute/numericbase.h index 24ed00f2ce4..bd3a68fdc60 100644 --- a/searchlib/src/vespa/searchlib/attribute/numericbase.h +++ b/searchlib/src/vespa/searchlib/attribute/numericbase.h @@ -6,7 +6,6 @@ #include "i_enum_store.h" #include "loadedenumvalue.h" #include "enum_store_loaders.h" -#include <vespa/searchlib/common/sort.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp b/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp index ad9a6c92eab..3b58620a526 100644 --- a/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp +++ b/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp @@ -17,6 +17,7 @@ #include <vespa/searchlib/queryeval/andnotsearch.h> #include <vespa/searchlib/queryeval/orsearch.h> #include <vespa/searchlib/common/bitvectoriterator.h> +#include <set> namespace search::test { |