diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-12-02 08:07:30 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-12-02 09:35:08 +0000 |
commit | 98b760a33c142227cd88448bc6666eb9809aa4a2 (patch) | |
tree | b36c7e4cdd582267f5a605bb8a2ebeb55d734e8c /persistence | |
parent | a7aa496c28792461b7e252a3046cf003ed0113b1 (diff) |
track namespace move in documenttypes.def
* For C++ code this introduces a "document::config" namespace, which will
sometimes conflict with the global "config" namespace.
* Move all forward-declarations of the types DocumenttypesConfig and
DocumenttypesConfigBuilder to a common header file.
Diffstat (limited to 'persistence')
-rw-r--r-- | persistence/src/tests/dummyimpl/dummyimpltest.cpp | 2 | ||||
-rw-r--r-- | persistence/src/vespa/persistence/conformancetest/conformancetest.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index e2b07a03e2b..4ff851e1735 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -15,7 +15,7 @@ struct DummyPersistenceFactory : public ConformanceTest::PersistenceFactory { using Repo = document::DocumentTypeRepo; std::unique_ptr<PersistenceProvider> - getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const Repo::DocumenttypesConfig&) override { + getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const DocumenttypesConfig&) override { return std::make_unique<dummy::DummyPersistence>(repo); } diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.h b/persistence/src/vespa/persistence/conformancetest/conformancetest.h index 5c3f20b1900..e07fc138487 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.h +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.h @@ -8,6 +8,7 @@ */ #pragma once +#include <vespa/document/config/doctypecfg.h> #include <vespa/persistence/spi/persistenceprovider.h> #include <gtest/gtest.h> @@ -19,8 +20,6 @@ class TestDocMan; } -namespace document::internal { class InternalDocumenttypesType; } - namespace storage::spi { class ConformanceTest : public ::testing::Test { @@ -29,7 +28,6 @@ public: using PersistenceProviderUP = std::unique_ptr<PersistenceProvider>; struct PersistenceFactory { typedef std::unique_ptr<PersistenceFactory> UP; - using DocumenttypesConfig = const document::internal::InternalDocumenttypesType; virtual ~PersistenceFactory() = default; virtual PersistenceProviderUP getPersistenceImplementation( |