diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2018-04-04 23:28:10 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-04-04 23:28:57 +0200 |
commit | d7d9b5c4c5e9b332767c6bd53ecfa6a03fdb97b7 (patch) | |
tree | e9b9e4ee7ae95d5fed154b806acc6f52f480ee0d /persistence | |
parent | 08bcb0eeffe5ebf9e94aea9d719abda2662bdaf1 (diff) |
Use forward declared DocumentTypeRepo.
Diffstat (limited to 'persistence')
4 files changed, 8 insertions, 3 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index 915d3e6a4b2..54876b01b81 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -3,6 +3,7 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> +#include <vespa/document/repo/documenttyperepo.h> namespace storage { namespace spi { diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp index 7f4ea9dcc2e..2a215b099b6 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp @@ -7,6 +7,7 @@ #include <vespa/document/fieldset/fieldsets.h> #include <vespa/document/update/documentupdate.h> #include <vespa/document/update/assignvalueupdate.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/metrics/loadmetric.h> #include <vespa/vdslib/state/state.h> diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.h b/persistence/src/vespa/persistence/conformancetest/conformancetest.h index bf63508693f..de6430c750a 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.h +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.h @@ -8,7 +8,6 @@ */ #pragma once -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/persistence/spi/persistenceprovider.h> #include <vespa/vdstestlib/cppunit/macros.h> @@ -64,21 +63,25 @@ namespace document { +class DocumentTypeRepo; class TestDocMan; } +namespace document::internal { class InternalDocumenttypesType; } + namespace storage { namespace spi { struct ConformanceTest : public CppUnit::TestFixture { struct PersistenceFactory { typedef std::unique_ptr<PersistenceFactory> UP; + using DocumenttypesConfig = const document::internal::InternalDocumenttypesType; virtual ~PersistenceFactory() {} virtual PersistenceProvider::UP getPersistenceImplementation( const std::shared_ptr<const document::DocumentTypeRepo> &repo, - const document::DocumentTypeRepo::DocumenttypesConfig &typesCfg) = 0; + const DocumenttypesConfig &typesCfg) = 0; virtual void clear(void) diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h index deb0ece98bd..c93b7fd22c7 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -9,7 +9,6 @@ #pragma once #include <vespa/persistence/spi/abstractpersistenceprovider.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/base/globalid.h> #include <vespa/document/fieldset/fieldsets.h> #include <vespa/vespalib/util/sync.h> @@ -18,6 +17,7 @@ #include <map> namespace document { +class DocumentTypeRepo; class FieldSet; namespace select { class Node; } } |