compat: drop pre-C++20 macros.hpp header

6 files changed, 6 insertions, 21 deletions

diff --git a/compat/check-visible.cpp b/compat/check-visible.cpp
index 4da649c7..621d941a 100644
--- a/compat/check-visible.cpp
+++ b/compat/check-visible.cpp
@@ -10,7 +10,7 @@ static bool visible = true;
 #if defined _WIN32
 
 #include "timer.hpp"
-#include "macros.hpp"
+#include "macros.h"
 
 static Timer timer;
 
diff --git a/compat/check-visible.hpp b/compat/check-visible.hpp
index e24260ab..6669b84d 100644
--- a/compat/check-visible.hpp
+++ b/compat/check-visible.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "export.hpp"
-#include "macros1.h"
+#include "macros.h"
 
 class QWidget;
 
diff --git a/compat/correlation-calibrator.cpp b/compat/correlation-calibrator.cpp
index 4f08ecd5..07ef7d3d 100644
--- a/compat/correlation-calibrator.cpp
+++ b/compat/correlation-calibrator.cpp
@@ -2,7 +2,7 @@
 #include "variance.hpp"
 #include "compat/math.hpp"
 #include "compat/meta.hpp"
-#include "compat/macros1.h"
+#include "compat/macros.h"
 
 #include <cmath>
 #include <iterator>
diff --git a/compat/macros1.h b/compat/macros.h
index 5325d055..5325d055 100644
--- a/compat/macros1.h
+++ b/compat/macros.h
diff --git a/compat/macros.hpp b/compat/macros.hpp
deleted file mode 100644
index b6eea12b..00000000
--- a/compat/macros.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "macros1.h"
-
-#include <utility>
-#include <type_traits>
-
-// before C++20
-namespace cxx20_compat {
-    template<typename T>
-    struct remove_cvref {
-        using type = std::remove_cv_t<std::remove_reference_t<T>>;
-    };
-} // ns cxx20_compat
-
-template<typename t>
-using remove_cvref_t = typename cxx20_compat::remove_cvref<t>::type;
diff --git a/compat/shm.h b/compat/shm.h
index d1363219..5036b335 100644
--- a/compat/shm.h
+++ b/compat/shm.h
@@ -20,7 +20,7 @@
 #endif
 
 #include "export.hpp"
-#include "macros1.h"
+#include "macros.h"
 
 class OTR_COMPAT_EXPORT shm_wrapper final
 {
@@ -39,4 +39,6 @@ public:
     bool unlock();
     bool success();
     inline void* ptr() { return mem; }
+
+    OTR_DISABLE_MOVE_COPY(shm_wrapper);
 };