Nuke core/macros.hh

5 files changed, 4 insertions, 28 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 13284cb..92f9cb8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -18,7 +18,6 @@ add_library(core STATIC
     "${CMAKE_CURRENT_LIST_DIR}/floathacks.hh"
     "${CMAKE_CURRENT_LIST_DIR}/image.cc"
     "${CMAKE_CURRENT_LIST_DIR}/image.hh"
-    "${CMAKE_CURRENT_LIST_DIR}/macros.hh"
     "${CMAKE_CURRENT_LIST_DIR}/pch.hh"
     "${CMAKE_CURRENT_LIST_DIR}/resource.hh"
     "${CMAKE_CURRENT_LIST_DIR}/strtools.cc"
diff --git a/src/core/aabb.hh b/src/core/aabb.hh
index fe07060..680c270 100644
--- a/src/core/aabb.hh
+++ b/src/core/aabb.hh
@@ -2,11 +2,9 @@
 #define CORE_AABB_HH 1
 #pragma once
 
-#include "core/macros.hh"
-
 class AABB final {
 public:
-    DECLARE_DEFAULT_CONSTRUCTOR(AABB);
+    AABB(void) = default;
     explicit AABB(const glm::fvec3& min, const glm::fvec3& max);
     virtual ~AABB(void) = default;
 
diff --git a/src/core/buffer.hh b/src/core/buffer.hh
index 4706ffe..35efa8b 100644
--- a/src/core/buffer.hh
+++ b/src/core/buffer.hh
@@ -2,11 +2,10 @@
 #define CORE_BUFFER_HH 1
 
 #include "core/floathacks.hh"
-#include "core/macros.hh"
 
 class ReadBuffer final {
 public:
-    DECLARE_DEFAULT_CONSTRUCTOR(ReadBuffer);
+    ReadBuffer(void) = default;
     explicit ReadBuffer(const void* data, std::size_t size);
     explicit ReadBuffer(const ENetPacket* packet);
     explicit ReadBuffer(PHYSFS_File* file);
@@ -49,7 +48,7 @@ private:
 
 class WriteBuffer final {
 public:
-    DECLARE_DEFAULT_CONSTRUCTOR(WriteBuffer);
+    WriteBuffer(void) = default;
     virtual ~WriteBuffer(void) = default;
 
     std::size_t size(void) const;
diff --git a/src/core/config.hh b/src/core/config.hh
index c3921a8..e63b560 100644
--- a/src/core/config.hh
+++ b/src/core/config.hh
@@ -3,7 +3,6 @@
 #pragma once
 
 #include "core/concepts.hh"
-#include "core/macros.hh"
 
 class IConfigValue {
 public:
@@ -95,7 +94,7 @@ private:
 
 class Config final {
 public:
-    DECLARE_DEFAULT_CONSTRUCTOR(Config);
+    Config(void) = default;
     virtual ~Config(void) = default;
 
     void load_cmdline(void);
diff --git a/src/core/macros.hh b/src/core/macros.hh
deleted file mode 100644
index fbbe10c..0000000
--- a/src/core/macros.hh
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef CORE_MACROS_HH
-#define CORE_MACROS_HH 1
-#pragma once
-
-#define DISABLE_COPY_OPERATORS(class_name)                 \
-public:                                                    \
-    explicit class_name(const class_name& other) = delete; \
-    class_name& operator=(const class_name& other) = delete
-
-#define DISABLE_MOVE_OPERATORS(class_name)            \
-public:                                               \
-    explicit class_name(class_name&& other) = delete; \
-    class_name& operator=(class_name&& other) = delete
-
-#define DECLARE_DEFAULT_CONSTRUCTOR(class_name) \
-public:                                         \
-    class_name(void) = default
-
-#endif // CORE_MACROS_HH