diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-04-04 11:45:55 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-04-04 11:45:55 +0000 |
commit | 8cfeaeba255ccea54f8345724e72adf53280e33d (patch) | |
tree | 711593ee26f3688371e0b0ae948247df22ee54d0 /storage/src/tests/distributor | |
parent | 7902239839a6f34e12ed7aa0f2b7a65114f8ee68 (diff) |
Stop using nested typedef for shared pointer to const DocumentTypeRepo.
Diffstat (limited to 'storage/src/tests/distributor')
7 files changed, 7 insertions, 7 deletions
diff --git a/storage/src/tests/distributor/distributortestutil.cpp b/storage/src/tests/distributor/distributortestutil.cpp index 33167d61026..e43161946fb 100644 --- a/storage/src/tests/distributor/distributortestutil.cpp +++ b/storage/src/tests/distributor/distributortestutil.cpp @@ -83,7 +83,7 @@ DistributorTestUtil::triggerDistributionChange(lib::Distribution::SP distr) } void -DistributorTestUtil::setTypeRepo(const document::DocumentTypeRepo::SP &repo) +DistributorTestUtil::setTypeRepo(const std::shared_ptr<const document::DocumentTypeRepo> &repo) { _node->getComponentRegister().setDocumentTypeRepo(repo); } diff --git a/storage/src/tests/distributor/distributortestutil.h b/storage/src/tests/distributor/distributortestutil.h index c2cb4fb2a62..69b5a5cdf6a 100644 --- a/storage/src/tests/distributor/distributortestutil.h +++ b/storage/src/tests/distributor/distributortestutil.h @@ -35,7 +35,7 @@ public: * Sets up the storage link chain. */ void createLinks(); - void setTypeRepo(const document::DocumentTypeRepo::SP &repo); + void setTypeRepo(const std::shared_ptr<const document::DocumentTypeRepo> &repo); void close(); diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp index 80636bd33a7..064348539bf 100644 --- a/storage/src/tests/distributor/getoperationtest.cpp +++ b/storage/src/tests/distributor/getoperationtest.cpp @@ -43,7 +43,7 @@ class GetOperationTest : public CppUnit::TestFixture, public DistributorTestUtil CPPUNIT_TEST(canGetDocumentsWhenAllReplicaNodesRetired); CPPUNIT_TEST_SUITE_END(); - document::DocumentTypeRepo::SP _repo; + std::shared_ptr<const document::DocumentTypeRepo> _repo; public: document::DocumentId docId; diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp index fe5373a936f..17dbf007c63 100644 --- a/storage/src/tests/distributor/operationtargetresolvertest.cpp +++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp @@ -27,7 +27,7 @@ struct OperationTargetResolverTest : public CppUnit::TestFixture, public DistributorTestUtil { - document::DocumentTypeRepo::SP _repo; + std::shared_ptr<const document::DocumentTypeRepo> _repo; const document::DocumentType* _html_type; std::unique_ptr<Operation> op; diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp index 776e0275f68..b43d3cf64ad 100644 --- a/storage/src/tests/distributor/putoperationtest.cpp +++ b/storage/src/tests/distributor/putoperationtest.cpp @@ -59,7 +59,7 @@ class PutOperationTest : public CppUnit::TestFixture, CPPUNIT_TEST(replicaNotImplicitlyActivatedWhenActivationIsDisabled); CPPUNIT_TEST_SUITE_END(); - DocumentTypeRepo::SP _repo; + std::shared_ptr<const DocumentTypeRepo> _repo; const DocumentType* _html_type; std::unique_ptr<Operation> op; diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp index ed961b29b1c..29d50b1b9b7 100644 --- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp +++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp @@ -68,7 +68,7 @@ class TwoPhaseUpdateOperationTest : public CppUnit::TestFixture, CPPUNIT_TEST_SUITE_END(); document::TestDocRepo _testRepo; - DocumentTypeRepo::SP _repo; + std::shared_ptr<const DocumentTypeRepo> _repo; const DocumentType* _doc_type; protected: diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp index c15a2b4057c..ccbee0093ba 100644 --- a/storage/src/tests/distributor/updateoperationtest.cpp +++ b/storage/src/tests/distributor/updateoperationtest.cpp @@ -35,7 +35,7 @@ class UpdateOperation_Test : public CppUnit::TestFixture, CPPUNIT_TEST(testMultiNodeInconsistentTimestamp); CPPUNIT_TEST_SUITE_END(); - DocumentTypeRepo::SP _repo; + std::shared_ptr<const DocumentTypeRepo> _repo; const DocumentType *_html_type; protected: |