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

3 files changed, 8 insertions, 6 deletions

diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index 80e6e8b3db8..5243b50eac2 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -156,7 +156,7 @@ void addDocument(DocBuilder & doc_builder, MemoryIndex &index, ISourceSelector &
                  uint8_t index_id, uint32_t docid, const string &word) {
     Document::UP doc = buildDocument(doc_builder, docid, word);
     index.insertDocument(docid, *doc);
-    index.commit(std::shared_ptr<search::IDestructorCallback>());
+    index.commit(std::shared_ptr<vespalib::IDestructorCallback>());
     selector.setSource(docid, index_id);
 }
 
diff --git a/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp b/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp
index 73919a7c628..a2d08f0121e 100644
--- a/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp
+++ b/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp
@@ -1,16 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("index_writer_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/searchcore/proton/index/index_writer.h>
 #include <vespa/searchcore/proton/test/mock_index_manager.h>
 #include <vespa/searchlib/index/docbuilder.h>
+#include <vespa/log/log.h>
+LOG_SETUP("index_writer_test");
 
 using namespace proton;
 using namespace search;
 using namespace search::index;
 using namespace searchcorespi;
+using vespalib::IDestructorCallback;
 
 using document::Document;
 
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 5ce4a1e949d..50d23529413 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -94,7 +94,7 @@ Document::UP buildDocument(DocBuilder &doc_builder, int id,
     return doc_builder.endDocument();
 }
 
-std::shared_ptr<search::IDestructorCallback> emptyDestructorCallback;
+std::shared_ptr<vespalib::IDestructorCallback> emptyDestructorCallback;
 
 struct IndexManagerTest : public ::testing::Test {
     SerialNum _serial_num;
@@ -398,7 +398,7 @@ TEST_F(IndexManagerTest, require_that_flush_stats_are_calculated)
     Document::UP doc = addDocument(docid);
     inverter.invertDocument(docid, *doc);
     invertThreads->sync();
-    inverter.pushDocuments(std::shared_ptr<search::IDestructorCallback>());
+    inverter.pushDocuments(std::shared_ptr<vespalib::IDestructorCallback>());
     pushThreads->sync();
     index_size = fic.getMemoryUsage().allocatedBytes() - fixed_index_size;
 
@@ -417,7 +417,7 @@ TEST_F(IndexManagerTest, require_that_flush_stats_are_calculated)
     doc = addDocument(docid + 100);
     inverter.invertDocument(docid + 100, *doc);
     invertThreads->sync();
-    inverter.pushDocuments(std::shared_ptr<search::IDestructorCallback>());
+    inverter.pushDocuments(std::shared_ptr<vespalib::IDestructorCallback>());
     pushThreads->sync();
     index_size = fic.getMemoryUsage().allocatedBytes() - fixed_index_size;
     /// Must account for both docid 0 being reserved and the extra after.