diff options
Diffstat (limited to 'searchcore/src/apps')
5 files changed, 6 insertions, 8 deletions
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index be9d394a2b6..214c57557bc 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -11,6 +11,7 @@ #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/document/base/testdocman.h> +#include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/fastos/file.h> @@ -55,7 +56,6 @@ using std::shared_ptr; using document::BucketSpace; using document::DocumentType; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; using document::TestDocMan; using document::test::makeBucketSpace; using search::TuneFileDocumentDB; diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp index 8db828920c0..9819a1d50af 100644 --- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp +++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp @@ -146,7 +146,7 @@ std::unique_ptr<CFG> getConfig() { } std::shared_ptr<const document::DocumentTypeRepo> getRepo() { - typedef document::DocumenttypesConfig DCFG; + typedef document::config::DocumenttypesConfig DCFG; std::unique_ptr<DCFG> dcfg = getConfig<DCFG>(); std::shared_ptr<const document::DocumentTypeRepo> ret; if (dcfg.get() != 0) { @@ -180,7 +180,7 @@ App::Main() fprintf(stderr, "input feed: %s\n", feedFile.c_str()); fprintf(stderr, "output directory: %s\n", dirName.c_str()); vespalib::mkdir(dirName); - typedef document::DocumenttypesConfig DCFG; + typedef document::config::DocumenttypesConfig DCFG; if (!writeConfig(getConfig<DCFG>(), dirName)) { fprintf(stderr, "error: could not save config to disk\n"); return 1; diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp index 1ccd8221aff..1488e87afdf 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -1,5 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/document/repo/documenttyperepo.h> @@ -36,8 +37,6 @@ using namespace std::chrono_literals; using document::DocumentTypeRepo; using document::DocumentTypeRepoFactory; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using search::bmcluster::AvgSampler; using search::bmcluster::BmClusterController; using search::bmcluster::IBmFeedHandler; diff --git a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp index f9833b430a0..c1dbe9b2bd2 100644 --- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp +++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp @@ -1,5 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/document/repo/documenttyperepo.h> @@ -38,8 +39,6 @@ using namespace std::chrono_literals; using document::DocumentTypeRepo; using document::DocumentTypeRepoFactory; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using search::bmcluster::AvgSampler; using search::bmcluster::BmClusterController; using search::bmcluster::IBmFeedHandler; diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp index 5c777baa3bb..a7f23c382e9 100644 --- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp +++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp @@ -8,6 +8,7 @@ #include <vespa/vespalib/util/programoptions.h> #include <vespa/vespalib/util/xmlstream.h> #include <vespa/vespalib/util/time.h> +#include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/fieldvalue/document.h> @@ -25,7 +26,6 @@ using namespace search; using namespace search::common; using namespace search::transactionlog; -using document::DocumenttypesConfig; using document::DocumentTypeRepo; typedef std::shared_ptr<DocumenttypesConfig> DocumenttypesConfigSP; |