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.
---
 storageserver/src/vespa/storageserver/app/process.cpp | 2 +-
 storageserver/src/vespa/storageserver/app/process.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'storageserver')

diff --git a/storageserver/src/vespa/storageserver/app/process.cpp b/storageserver/src/vespa/storageserver/app/process.cpp
index 9ec1ed2bd10..8480f1427f2 100644
--- a/storageserver/src/vespa/storageserver/app/process.cpp
+++ b/storageserver/src/vespa/storageserver/app/process.cpp
@@ -21,7 +21,7 @@ Process::Process(const config::ConfigUri & configUri)
 void
 Process::setupConfig(milliseconds subscribeTimeout)
 {
-    _documentHandler = _configSubscriber.subscribe<document::DocumenttypesConfig>(_configUri.getConfigId(), subscribeTimeout);
+    _documentHandler = _configSubscriber.subscribe<document::config::DocumenttypesConfig>(_configUri.getConfigId(), subscribeTimeout);
     if (!_configSubscriber.nextConfig()) {
         throw vespalib::TimeoutException("Could not subscribe to document config within timeout");
     }
diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h
index 5f22906896b..407c8cf8881 100644
--- a/storageserver/src/vespa/storageserver/app/process.h
+++ b/storageserver/src/vespa/storageserver/app/process.h
@@ -34,7 +34,7 @@ protected:
     config::ConfigSubscriber _configSubscriber;
 
 private:
-    config::ConfigHandle<document::DocumenttypesConfig>::UP _documentHandler;
+    config::ConfigHandle<document::config::DocumenttypesConfig>::UP _documentHandler;
     std::vector<DocumentTypeRepoSP> _repos;
 
 public:
-- 
cgit v1.2.3