From 5f4251e36812dc68bff9e59c012c1e2f7aa697f8 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 17 Sep 2021 09:20:07 +0200
Subject: Moved zenserverprocess into zenutil/zenserverprocess.h

---
 zenserver/zenserver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zenserver/zenserver.cpp')

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index f1960ab36..3681d2f8c 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -11,7 +11,7 @@
 #include <zencore/timer.h>
 #include <zencore/windows.h>
 #include <zenhttp/httpserver.h>
-#include <zenserverprocess.h>
+#include <zenutil/zenserverprocess.h>
 #include <zenstore/cas.h>
 #include <zenstore/cidstore.h>
 
-- 
cgit v1.2.3


From 6da25650aa4bf87dcd5e3d612c615e0b8240015f Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 17 Sep 2021 09:54:50 +0200
Subject: Added namespace scopes to more includes for better consistency

---
 zenserver/zenserver.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'zenserver/zenserver.cpp')

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 3681d2f8c..eb0324161 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -82,6 +82,8 @@
 
 #define ZEN_APP_NAME "Zen store"
 
+namespace zen {
+
 class ZenServer
 {
 	ZenServerState::ZenServerEntry* m_ServerEntry = nullptr;
@@ -420,9 +422,13 @@ private:
 	bool m_DebugOptionForcedCrash = false;
 };
 
+}
+
 int
 main(int argc, char* argv[])
 {
+	using namespace zen;
+
 	mi_version();
 
 	ZenServerOptions GlobalOptions;
-- 
cgit v1.2.3