From 2e61b990f76edcd79914100c2d5de106bf13ca97 Mon Sep 17 00:00:00 2001
From: OLEGSHA <kvadropups@gmail.com>
Date: Sat, 11 Mar 2023 20:43:28 +0100
Subject: [PATCH] TMP / Removed boost dependency

---
 CMakeLists.txt                      |  4 ----
 desktop/graphics/vulkan_adapter.h   |  1 -
 desktop/graphics/vulkan_buffer.h    |  1 -
 desktop/graphics/vulkan_common.h    |  4 ++--
 desktop/graphics/vulkan_image.h     |  1 -
 main/logging.h                      |  4 ++--
 main/rendering/graphics_interface.h | 12 ++++++------
 main/util.h                         | 12 ++++++++++++
 8 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6282822..8b0ca65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,3 @@ target_link_libraries(progressia glm::glm)
 # Use STB
 target_include_directories(progressia PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/stb/include)
-
-# Use Boost
-find_package(Boost 1.74 REQUIRED)
-target_link_libraries(progressia Boost::headers)
diff --git a/desktop/graphics/vulkan_adapter.h b/desktop/graphics/vulkan_adapter.h
index 15446b4..357dcc1 100644
--- a/desktop/graphics/vulkan_adapter.h
+++ b/desktop/graphics/vulkan_adapter.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "boost/core/noncopyable.hpp"
 #include "vulkan_common.h"
 #include "vulkan_descriptor_set.h"
 #include "vulkan_image.h"
diff --git a/desktop/graphics/vulkan_buffer.h b/desktop/graphics/vulkan_buffer.h
index 352bc71..6f3839f 100644
--- a/desktop/graphics/vulkan_buffer.h
+++ b/desktop/graphics/vulkan_buffer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <boost/core/noncopyable.hpp>
 #include <vector>
 
 #include "vulkan_common.h"
diff --git a/desktop/graphics/vulkan_common.h b/desktop/graphics/vulkan_common.h
index 1921b06..064736b 100644
--- a/desktop/graphics/vulkan_common.h
+++ b/desktop/graphics/vulkan_common.h
@@ -17,7 +17,7 @@
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
-#include <boost/core/noncopyable.hpp>
+#include "../../main/util.h"
 
 #include "../../main/logging.h"
 #include "../../main/rendering/graphics_interface.h"
@@ -54,7 +54,7 @@ struct CstrCompare {
 using CstrHashSet = std::unordered_set<const char *, CstrHash, CstrEqual>;
 } // namespace CstrUtils
 
-class VkObjectWrapper : private boost::noncopyable {
+class VkObjectWrapper : private progressia::main::NonCopyable {
     // empty
 };
 
diff --git a/desktop/graphics/vulkan_image.h b/desktop/graphics/vulkan_image.h
index 07accb6..a7f1d98 100644
--- a/desktop/graphics/vulkan_image.h
+++ b/desktop/graphics/vulkan_image.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <boost/core/noncopyable.hpp>
 #include <vector>
 
 #include "vulkan_buffer.h"
diff --git a/main/logging.h b/main/logging.h
index f6bc072..82318ff 100644
--- a/main/logging.h
+++ b/main/logging.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "boost/core/noncopyable.hpp"
+#include "util.h"
 #include <ostream>
 
 namespace progressia {
@@ -8,7 +8,7 @@ namespace main {
 
 namespace detail {
 
-class LogSink : private boost::noncopyable {
+class LogSink : private progressia::main::NonCopyable {
   private:
     bool isCurrentSink;
 
diff --git a/main/rendering/graphics_interface.h b/main/rendering/graphics_interface.h
index 8b44b9e..424297f 100644
--- a/main/rendering/graphics_interface.h
+++ b/main/rendering/graphics_interface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "boost/core/noncopyable.hpp"
+#include "../util.h"
 #include <vector>
 
 #define GLM_FORCE_RADIANS
@@ -25,7 +25,7 @@ struct Vertex {
     glm::vec2 texCoord;
 };
 
-class Texture : private boost::noncopyable {
+class Texture : private progressia::main::NonCopyable {
   public:
     using Backend = void *;
 
@@ -39,7 +39,7 @@ class Texture : private boost::noncopyable {
     ~Texture();
 };
 
-class Primitive : private boost::noncopyable {
+class Primitive : private progressia::main::NonCopyable {
   public:
     using Backend = void *;
 
@@ -57,7 +57,7 @@ class Primitive : private boost::noncopyable {
     const Texture *getTexture() const;
 };
 
-class View : private boost::noncopyable {
+class View : private progressia::main::NonCopyable {
   public:
     using Backend = void *;
 
@@ -72,7 +72,7 @@ class View : private boost::noncopyable {
     void use();
 };
 
-class Light : private boost::noncopyable {
+class Light : private progressia::main::NonCopyable {
   public:
     using Backend = void *;
 
@@ -88,7 +88,7 @@ class Light : private boost::noncopyable {
     void use();
 };
 
-class GraphicsInterface : private boost::noncopyable {
+class GraphicsInterface : private progressia::main::NonCopyable {
   public:
     using Backend = void *;
 
diff --git a/main/util.h b/main/util.h
index 34f4ccc..60b9da9 100644
--- a/main/util.h
+++ b/main/util.h
@@ -28,3 +28,15 @@
     };                                        \
 }
 // clang-format on
+
+namespace progressia {
+namespace main {
+
+struct NonCopyable {
+    NonCopyable &operator=(const NonCopyable &) = delete;
+    NonCopyable(const NonCopyable &) = delete;
+    NonCopyable() = default;
+};
+
+} // namespace main
+} // namespace progressia