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 /searchcore/src/tests/proton/documentdb/fileconfigmanager | |
| 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 'searchcore/src/tests/proton/documentdb/fileconfigmanager')
| -rw-r--r-- | searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index 469cffaa31a..2fa2742b3df 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp @@ -8,6 +8,7 @@ #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/config/helper/configgetter.hpp> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/searchcore/proton/server/bootstrapconfig.h> #include <vespa/searchcore/proton/server/fileconfigmanager.h> @@ -40,10 +41,10 @@ vespalib::string myId("myconfigid"); DocumentDBConfig::SP makeBaseConfigSnapshot() { - config::DirSpec spec(TEST_PATH("cfg")); + ::config::DirSpec spec(TEST_PATH("cfg")); DBCM dbcm(spec, "test"); - DocumenttypesConfigSP dtcfg(config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release()); + DocumenttypesConfigSP dtcfg(::config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release()); auto b = std::make_shared<BootstrapConfig>(1, dtcfg, std::make_shared<DocumentTypeRepo>(*dtcfg), std::make_shared<ProtonConfig>(), |