From 8cfeaeba255ccea54f8345724e72adf53280e33d Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@oath.com>
Date: Wed, 4 Apr 2018 11:45:55 +0000
Subject: Stop using nested typedef for shared pointer to const
 DocumentTypeRepo.

---
 memfilepersistence/src/tests/spi/memfiletestutils.h                    | 2 +-
 memfilepersistence/src/tests/spi/providerconformancetest.cpp           | 2 +-
 memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'memfilepersistence')

diff --git a/memfilepersistence/src/tests/spi/memfiletestutils.h b/memfilepersistence/src/tests/spi/memfiletestutils.h
index 450d87451b9..657b116b6e5 100644
--- a/memfilepersistence/src/tests/spi/memfiletestutils.h
+++ b/memfilepersistence/src/tests/spi/memfiletestutils.h
@@ -191,7 +191,7 @@ public:
             const document::DocumentId& id,
             const document::FieldValue& updateValue);
 
-    virtual const document::DocumentTypeRepo::SP getTypeRepo() const
+    virtual const std::shared_ptr<const document::DocumentTypeRepo> getTypeRepo() const
     { return document::TestDocMan::getTypeRepoSP(); }
 
     /**
diff --git a/memfilepersistence/src/tests/spi/providerconformancetest.cpp b/memfilepersistence/src/tests/spi/providerconformancetest.cpp
index 625549f0008..7ba91bde619 100644
--- a/memfilepersistence/src/tests/spi/providerconformancetest.cpp
+++ b/memfilepersistence/src/tests/spi/providerconformancetest.cpp
@@ -20,7 +20,7 @@ struct ProviderConformanceTest : public spi::ConformanceTest {
         }
 
         spi::PersistenceProvider::UP
-        getPersistenceImplementation(const document::DocumentTypeRepo::SP& repo,
+        getPersistenceImplementation(const std::shared_ptr<const document::DocumentTypeRepo>& repo,
                                      const document::DocumenttypesConfig&) override
         {
             system("rm -rf vdsroot");
diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp
index 9781c28823d..b267fff0ab0 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp
@@ -144,7 +144,7 @@ namespace {
         MemFileMapper _mapper;
         DeviceManager _deviceManager;
         document::DocumentType _docType;
-        DocumentTypeRepo::SP _repo;
+        std::shared_ptr<const DocumentTypeRepo> _repo;
         vespa::config::storage::StorMemfilepersistenceConfigBuilder _memFileConfig;
         vespa::config::content::PersistenceConfigBuilder _persistenceConfig;
         vespa::config::storage::StorDevicesConfigBuilder _deviceConfig;
-- 
cgit v1.2.3