Move idestructorcallback.h to vespalib module and search::IDestructorCallback to vespalib::IdestructorCallback.

3 files changed, 6 insertions, 6 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h b/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h
index cc07a940ef1..300c2af265d 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h
@@ -8,7 +8,7 @@
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/vespalib/util/closure.h>
 
-namespace search { class IDestructorCallback; }
+namespace vespalib { class IDestructorCallback; }
 namespace document { class Document; }
 
 namespace searchcorespi {
@@ -36,7 +36,7 @@ protected:
     typedef search::index::Schema Schema;
 
 public:
-    using OnWriteDoneType = const std::shared_ptr<search::IDestructorCallback> &;
+    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
     /**
      * Interface used to signal when index manager has been reconfigured.
      */
@@ -51,7 +51,7 @@ public:
     typedef std::unique_ptr<IIndexManager> UP;
     typedef std::shared_ptr<IIndexManager> SP;
 
-    virtual ~IIndexManager() {}
+    virtual ~IIndexManager() = default;
 
     /**
      * Inserts a document into the index. This method is async, caller
diff --git a/searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h b/searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h
index d33080552e8..175bc82f81e 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h
@@ -8,7 +8,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/memoryusage.h>
 
-namespace search { class IDestructorCallback; }
+namespace vespalib { class IDestructorCallback; }
 
 namespace searchcorespi::index {
 
@@ -17,7 +17,7 @@ namespace searchcorespi::index {
  */
 struct IMemoryIndex : public searchcorespi::IndexSearchable {
     using SP = std::shared_ptr<IMemoryIndex>;
-    using OnWriteDoneType = const std::shared_ptr<search::IDestructorCallback> &;
+    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
     virtual ~IMemoryIndex() {}
 
     /**
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
index 38990f61b43..1fe23dd16ae 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
@@ -1197,7 +1197,7 @@ IndexMaintainer::commit()
     // only triggered via scheduleCommit()
     assert(_ctx.getThreadingService().index().isCurrentThread());
     LockGuard lock(_index_update_lock);
-    _current_index->commit(std::shared_ptr<search::IDestructorCallback>(),
+    _current_index->commit(std::shared_ptr<vespalib::IDestructorCallback>(),
                            _current_serial_num);
     // caller calls _ctx.getThreadingService().sync()
 }