From 6a5d207920f030e54710af12463f4a701c09b118 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 15 Sep 2021 10:15:24 +0200
Subject: Changed direct includes of spdlog/spdlog.h into zencore/logging.h to
 make it easier to tweak implementation

---
 zencore/filesystem.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'zencore/filesystem.cpp')

diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp
index 09c2e7386..e03c3aa37 100644
--- a/zencore/filesystem.cpp
+++ b/zencore/filesystem.cpp
@@ -4,6 +4,7 @@
 
 #include <zencore/except.h>
 #include <zencore/fmtutils.h>
+#include <zencore/logging.h>
 #include <zencore/iobuffer.h>
 #include <zencore/string.h>
 #include <zencore/windows.h>
@@ -14,8 +15,6 @@
 #include <winnt.h>
 #include <filesystem>
 
-#include <spdlog/spdlog.h>
-
 #include <gsl/gsl-lite.hpp>
 
 namespace zen {
-- 
cgit v1.2.3


From 2b9bed6635d95e15847c4d9b602e34d90e277d14 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 15 Sep 2021 11:27:48 +0200
Subject: Changed logging implementation

* Code should no longer directly `#include spdlog/spdlog.h`, instead use `#include <zencore/logging.h>`
* Instead of explicit calls to `spdlog::info(...)` and such please use the logging macros defined in `zencore/logging.h`. I.e `ZEN_INFO`, `ZEN_DEBUG`, `ZEN_TRACE`, `ZEN_ERROR`, `ZEN_CRITITCAL`
* The macros will pick up the "most local" logger via a `Log()` call to retrieve a logger instance. To override the default logger in a class please implement your own `Log()` function
---
 zencore/filesystem.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'zencore/filesystem.cpp')

diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp
index e03c3aa37..329cc241d 100644
--- a/zencore/filesystem.cpp
+++ b/zencore/filesystem.cpp
@@ -4,8 +4,8 @@
 
 #include <zencore/except.h>
 #include <zencore/fmtutils.h>
-#include <zencore/logging.h>
 #include <zencore/iobuffer.h>
+#include <zencore/logging.h>
 #include <zencore/string.h>
 #include <zencore/windows.h>
 
@@ -581,7 +581,7 @@ FileSystemTraversal::TraverseFileSystem(const std::filesystem::path& RootDir, Tr
 			}
 			else if (DirInfo->FileAttributes & FILE_ATTRIBUTE_DEVICE)
 			{
-				spdlog::warn("encountered device node during file system traversal: {} found in {}", WideToUtf8(FileName), RootDir);
+				ZEN_WARN("encountered device node during file system traversal: {} found in {}", WideToUtf8(FileName), RootDir);
 			}
 			else
 			{
-- 
cgit v1.2.3


From 02ab6e97cf6de3f21283f766a6f585d14965867c Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 15 Sep 2021 14:57:03 +0200
Subject: Unused variable warning fix

---
 zencore/filesystem.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'zencore/filesystem.cpp')

diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp
index 329cc241d..59300b7ad 100644
--- a/zencore/filesystem.cpp
+++ b/zencore/filesystem.cpp
@@ -617,6 +617,8 @@ PathFromHandle(void* NativeHandle)
 
 	const DWORD FinalLength = GetFinalPathNameByHandleW(NativeHandle, FullPath.data(), RequiredLengthIncludingNul, FILE_NAME_OPENED);
 
+	ZEN_UNUSED(FinalLength);
+
 	return FullPath;
 }
 
-- 
cgit v1.2.3