Revert "Revert "Balder/use an actual fieldset repo""

2 files changed, 6 insertions, 6 deletions

diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp
index 18cd7fab2b8..216e02c5edd 100644
--- a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp
+++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp
@@ -35,7 +35,7 @@ private:
 
 public:
     SearchVisitorTest();
-    ~SearchVisitorTest();
+    ~SearchVisitorTest() override;
     int Main() override;
 };
 
@@ -46,9 +46,9 @@ SearchVisitorTest::SearchVisitorTest() :
 {
     _componentRegister.setNodeInfo("mycluster", lib::NodeType::STORAGE, 1);
     _componentRegister.setClock(_clock);
-    StorageComponent::DocumentTypeRepoSP repo(new DocumentTypeRepo(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg"))));
+    auto repo = std::make_shared<DocumentTypeRepo>(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg")));
     _componentRegister.setDocumentTypeRepo(repo);
-    _component.reset(new StorageComponent(_componentRegister, "storage"));
+    _component = std::make_unique<StorageComponent>(_componentRegister, "storage");
 }
 
 SearchVisitorTest::~SearchVisitorTest() = default;
@@ -80,8 +80,8 @@ SearchVisitorTest::testCreateSearchVisitor(const vespalib::string & dir, const v
 void
 SearchVisitorTest::testSearchEnvironment()
 {
-    EXPECT_TRUE(_env.getVSMAdapter("simple") != NULL);
-    EXPECT_TRUE(_env.getRankManager("simple") != NULL);
+    EXPECT_TRUE(_env.getVSMAdapter("simple") != nullptr);
+    EXPECT_TRUE(_env.getRankManager("simple") != nullptr);
 }
 
 void
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 76ef0f23dd2..cc28c76acce 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -677,7 +677,7 @@ SearchVisitor::setupScratchDocument(const StringFieldIdTMap & fieldsInQuery)
     }
     // Init based on default document type and mapping from field name to field id
     _docTypeMapping.init(_fieldSearchSpecMap.documentTypeMap().begin()->first,
-                         _fieldsUnion, *_component.getTypeRepo());
+                         _fieldsUnion, *_component.getTypeRepo()->documentTypeRepo);
     _docTypeMapping.prepareBaseDoc(_fieldPathMap);
 }