Eliminate namespace pollution caused by misplaced using statement.

5 files changed, 8 insertions, 9 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h b/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h
index 21dc822bb2a..2d0fe0d15b4 100644
--- a/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h
@@ -9,8 +9,6 @@
 
 namespace proton {
 
-using searchcorespi::IIndexManager;
-
 /**
  * Interface for an index writer that handles writes in form of put and remove
  * to an underlying memory index.
@@ -19,7 +17,8 @@ class IIndexWriter {
 public:
     typedef std::unique_ptr<IIndexWriter> UP;
     typedef std::shared_ptr<IIndexWriter> SP;
-    using OnWriteDoneType = searchcorespi::IIndexManager::OnWriteDoneType;
+    using IIndexManager = searchcorespi::IIndexManager;
+    using OnWriteDoneType = IIndexManager::OnWriteDoneType;
 
     virtual ~IIndexWriter() {}
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
index be509bfba44..c6a6a4529a8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
@@ -139,7 +139,7 @@ SearchableDocSubDBConfigurer::reconfigureIndexSearchable()
 {
     SearchableFeedView::SP feedView(_feedView.get());
     const IIndexWriter::SP &indexWriter = feedView->getIndexWriter();
-    const IIndexManager::SP &indexManager = indexWriter->getIndexManager();
+    const searchcorespi::IIndexManager::SP &indexManager = indexWriter->getIndexManager();
     reconfigureMatchView(indexManager->getSearchable());
     const SearchView::SP searchView(_searchView.get());
     reconfigureFeedView(searchView);
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
index f826d7cfcdc..d7485a155f5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
@@ -75,7 +75,7 @@ private:
     typedef FastAccessDocSubDB Parent;
     using IFlushTargetList = std::vector<std::shared_ptr<searchcorespi::IFlushTarget>>;
 
-    IIndexManager::SP                           _indexMgr;
+    searchcorespi::IIndexManager::SP            _indexMgr;
     IIndexWriter::SP                            _indexWriter;
     vespalib::VarHolder<SearchView::SP>         _rSearchView;
     vespalib::VarHolder<SearchableFeedView::SP> _rFeedView;
@@ -145,7 +145,7 @@ public:
         return _rSearchView.get()->getAttributeManager();
     }
 
-    const IIndexManager::SP &getIndexManager() const override {
+    const searchcorespi::IIndexManager::SP &getIndexManager() const override {
         return _indexMgr;
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 4fbae82fe25..464602a76b4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -54,7 +54,7 @@ namespace proton {
 
 namespace {
 
-IIndexManager::SP nullIndexManager;
+searchcorespi::IIndexManager::SP nullIndexManager;
 IIndexWriter::SP nullIndexWriter;
 
 }
@@ -447,7 +447,7 @@ StoreOnlyDocSubDB::getAttributeManager() const
     return proton::IAttributeManager::SP();
 }
 
-const IIndexManager::SP &
+const searchcorespi::IIndexManager::SP &
 StoreOnlyDocSubDB::getIndexManager() const
 {
     return nullIndexManager;
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h b/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h
index 34b246a1d1b..07891c1ac66 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h
@@ -10,7 +10,7 @@ namespace test {
 /**
  * Mock of the IIndexManager interface used for unit testing.
  */
-struct MockIndexManager : public IIndexManager
+struct MockIndexManager : public searchcorespi::IIndexManager
 {
     virtual void putDocument(uint32_t, const Document &, SerialNum) override {}
     virtual void removeDocument(uint32_t, SerialNum) override {}