diff options
6 files changed, 13 insertions, 17 deletions
diff --git a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp index d679319924d..f3082e858a3 100644 --- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp +++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp @@ -9,9 +9,9 @@ #include <vespa/log/log.h> LOG_SETUP("enum_comparator_test"); -namespace search { +using namespace search::btree; -using namespace btree; +namespace search { using NumericEnumStore = EnumStoreT<int32_t>; using FloatEnumStore = EnumStoreT<float>; diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp index ed6bd7168f2..9347e99f6c2 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -25,10 +25,11 @@ #include <vespa/log/log.h> LOG_SETUP("field_index_test"); +using namespace search::btree; +using namespace search::datastore; + namespace search { -using namespace btree; -using namespace datastore; using namespace fef; using namespace index; diff --git a/searchlib/src/vespa/searchlib/attribute/enumhintsearchcontext.h b/searchlib/src/vespa/searchlib/attribute/enumhintsearchcontext.h index b83ea2e6c46..9ec6b0842f6 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumhintsearchcontext.h +++ b/searchlib/src/vespa/searchlib/attribute/enumhintsearchcontext.h @@ -6,11 +6,9 @@ #include "ipostinglistsearchcontext.h" #include <vespa/searchlib/queryeval/searchiterator.h> -namespace search { +namespace search::datastore { class EntryComparator; } -namespace datastore { class EntryComparator; } - -namespace attribute { +namespace search::attribute { /** * Search context helper for enumerated attributes, used to eliminate @@ -41,4 +39,3 @@ protected: }; } -} diff --git a/searchlib/src/vespa/searchlib/attribute/i_enum_store.h b/searchlib/src/vespa/searchlib/attribute/i_enum_store.h index 93d5d79e670..63b778f60ab 100644 --- a/searchlib/src/vespa/searchlib/attribute/i_enum_store.h +++ b/searchlib/src/vespa/searchlib/attribute/i_enum_store.h @@ -13,9 +13,7 @@ #include <cassert> #include <set> -namespace search { - -namespace datastore { +namespace search::datastore { class DataStoreBase; @@ -23,6 +21,8 @@ template <typename> class UniqueStoreRemapper; } +namespace search { + class BufferWriter; class CompactionStrategy; class IEnumStoreDictionary; diff --git a/searchlib/src/vespa/searchlib/attribute/postingchange.h b/searchlib/src/vespa/searchlib/attribute/postingchange.h index 26b004270bf..5edb2c87038 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingchange.h +++ b/searchlib/src/vespa/searchlib/attribute/postingchange.h @@ -6,9 +6,9 @@ #include "postingdata.h" #include <vespa/vespalib/util/array.h> -namespace search { +namespace search::datastore { class EntryComparator; } -namespace datastore { class EntryComparator; } +namespace search { class GrowableBitVector; diff --git a/vespalib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp index 042a1f69bb2..1b7eb4512ad 100644 --- a/vespalib/src/tests/btree/btree_test.cpp +++ b/vespalib/src/tests/btree/btree_test.cpp @@ -23,8 +23,7 @@ LOG_SETUP("btree_test"); using vespalib::GenerationHandler; using search::datastore::EntryRef; -namespace search { -namespace btree { +namespace search::btree { namespace { @@ -1521,6 +1520,5 @@ Test::Main() } } -} TEST_APPHOOK(search::btree::Test); |