From 98b760a33c142227cd88448bc6666eb9809aa4a2 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahooinc.com>
Date: Thu, 2 Dec 2021 08:07:30 +0000
Subject: 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.
---
 documentapi/src/tests/messagebus/messagebus_test.cpp | 1 +
 documentapi/src/tests/messages/testbase.cpp          | 1 +
 documentapi/src/tests/policies/policies_test.cpp     | 1 +
 3 files changed, 3 insertions(+)

(limited to 'documentapi')

diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index 7dd47a0b93e..1ae280601f6 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/update/documentupdate.h>
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp
index 343f7d0b0ae..08905968a7a 100644
--- a/documentapi/src/tests/messages/testbase.cpp
+++ b/documentapi/src/tests/messages/testbase.cpp
@@ -3,6 +3,7 @@
 #include "testbase.h"
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/vespalib/util/exception.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <fcntl.h>
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index f17114d8cd7..600d065d425 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -18,6 +18,7 @@
 #include <vespa/messagebus/testlib/testserver.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/fieldvalue/longfieldvalue.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
-- 
cgit v1.2.3