Use shared ptr and Idesructorcallback to make it more flexible.

3 files changed, 8 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index 5e3e5cd78be..eb2ffff620d 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -46,7 +46,7 @@ using vespalib::Slime;
 
 namespace {
 
-class LocalTransport : public FeedToken::ITransport {
+class LocalTransport : public feedtoken::ITransport {
     mbus::Receptor _receptor;
 
 public:
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index e70e83fd61e..dc63f5329ce 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -295,7 +295,7 @@ struct UpdateContext {
 };
 
 
-struct MyTransport : public FeedToken::ITransport {
+struct MyTransport : public feedtoken::ITransport {
     vespalib::Gate gate;
     ResultUP result;
     bool documentWasFound;
@@ -309,7 +309,7 @@ struct MyTransport : public FeedToken::ITransport {
 };
 
 MyTransport::MyTransport() : gate(), result(), documentWasFound(false) {}
-MyTransport::~MyTransport() {}
+MyTransport::~MyTransport() = default;
 
 struct FeedTokenContext {
     MyTransport transport;
@@ -322,13 +322,13 @@ struct FeedTokenContext {
         if (transport.result.get()) {
             return transport.result.get();
         }
-        return &token.getResult();
+        return &token->getResult();
     }
 };
 
 FeedTokenContext::FeedTokenContext()
     : transport(),
-      token(transport)
+      token(feedtoken::make(transport))
 {}
 
 FeedTokenContext::~FeedTokenContext() = default;
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 548ce8ba20d..78f3d37675f 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -405,7 +405,7 @@ MyAttributeWriter::MyAttributeWriter(MyTracer &tracer)
 }
 MyAttributeWriter::~MyAttributeWriter() {}
 
-struct MyTransport : public FeedToken::ITransport
+struct MyTransport : public feedtoken::ITransport
 {
     ResultUP lastResult;
     vespalib::Gate _gate;
@@ -421,7 +421,7 @@ struct MyTransport : public FeedToken::ITransport
 };
 
 MyTransport::MyTransport(MyTracer &tracer) : lastResult(), _gate(), _tracer(tracer) {}
-MyTransport::~MyTransport() {}
+MyTransport::~MyTransport() = default;
 
 struct MyResultHandler : public IGenericResultHandler
 {
@@ -491,7 +491,7 @@ struct FeedTokenContext
 };
 
 FeedTokenContext::FeedTokenContext(MyTracer &tracer)
-    : mt(tracer), ft(mt)
+    : mt(tracer), ft(feedtoken::make(mt))
 {}
 FeedTokenContext::~FeedTokenContext() = default;