diff options
Diffstat (limited to 'persistence/src')
5 files changed, 6 insertions, 6 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index 699a3a336a7..915d3e6a4b2 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -12,7 +12,7 @@ struct DummyImplTest : public ConformanceTest { using Repo = document::DocumentTypeRepo; PersistenceProvider::UP - getPersistenceImplementation(const Repo::SP& repo, const Repo::DocumenttypesConfig&) override { + getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const Repo::DocumenttypesConfig&) override { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } diff --git a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp index c9e6b44508e..637b9ef512a 100644 --- a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp +++ b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp @@ -79,7 +79,7 @@ TEST_F("require that setClusterState sets the cluster state", Fixture) { lib::Distribution d(lib::Distribution::getDefaultDistributionConfig(3, 3)); ClusterState state(s, 1, d); - document::DocumentTypeRepo::SP repo; + std::shared_ptr<const document::DocumentTypeRepo> repo; dummy::DummyPersistence provider(repo); provider.setClusterState(makeBucketSpace(), state); diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.h b/persistence/src/vespa/persistence/conformancetest/conformancetest.h index 66b1dec113a..bf63508693f 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.h +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.h @@ -77,7 +77,7 @@ struct ConformanceTest : public CppUnit::TestFixture { virtual ~PersistenceFactory() {} virtual PersistenceProvider::UP getPersistenceImplementation( - const document::DocumentTypeRepo::SP &repo, + const std::shared_ptr<const document::DocumentTypeRepo> &repo, const document::DocumentTypeRepo::DocumenttypesConfig &typesCfg) = 0; virtual void diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp index 84adaa574ec..0ce3cbe8b3d 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp @@ -294,7 +294,7 @@ BucketContent::eraseEntry(Timestamp t) } DummyPersistence::DummyPersistence( - const document::DocumentTypeRepo::SP& repo, + const std::shared_ptr<const document::DocumentTypeRepo>& repo, uint16_t partitionCount) : _initialized(false), _repo(repo), diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h index f89afbcac5d..deb0ece98bd 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -127,7 +127,7 @@ private: class DummyPersistence : public AbstractPersistenceProvider { public: - DummyPersistence(const document::DocumentTypeRepo::SP& repo, + DummyPersistence(const std::shared_ptr<const document::DocumentTypeRepo>& repo, uint16_t partitionCount = 1); ~DummyPersistence(); @@ -211,7 +211,7 @@ private: void releaseBucketNoLock(const BucketContent& bc) const; mutable bool _initialized; - document::DocumentTypeRepo::SP _repo; + std::shared_ptr<const document::DocumentTypeRepo> _repo; PartitionStateList _partitions; typedef vespalib::hash_map<Bucket, BucketContent::SP, document::BucketId::hash> PartitionContent; |