feat: add define SAFETYHOOK_USE_CXXMODULES

cursey · Feb 25, 2024 · 195f179 · 195f179
1 parent 91fbc79
commit 195f179
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git a/include/safetyhook/allocator.hpp b/include/safetyhook/allocator.hpp
@@ -3,11 +3,15 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <memory>
 #include <mutex>
 #include <vector>
+#elif 
+import std.compat;
+#endif
 
 namespace safetyhook {
 class Allocator;

diff --git a/include/safetyhook/context.hpp b/include/safetyhook/context.hpp
@@ -3,7 +3,11 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
+#elif
+import std.compat;
+#endif
 
 #include "safetyhook/common.hpp"
 

diff --git a/include/safetyhook/inline_hook.hpp b/include/safetyhook/inline_hook.hpp
@@ -3,12 +3,16 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <memory>
 #include <mutex>
 #include <utility>
 #include <vector>
+#elif 
+import std.compat;
+#endif
 
 #include "safetyhook/allocator.hpp"
 #include "safetyhook/common.hpp"

diff --git a/include/safetyhook/mid_hook.hpp b/include/safetyhook/mid_hook.hpp
@@ -3,8 +3,12 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <memory>
+#elif 
+import std.compat;
+#endif
 
 #include "safetyhook/allocator.hpp"
 #include "safetyhook/context.hpp"

diff --git a/include/safetyhook/os.hpp b/include/safetyhook/os.hpp
@@ -1,9 +1,13 @@
 // This is the OS abstraction layer.
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <functional>
+#elif
+import std.compat;
+#endif
 
 namespace safetyhook {
 

diff --git a/include/safetyhook/utility.hpp b/include/safetyhook/utility.hpp
@@ -1,9 +1,13 @@
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <algorithm>
 #include <cstdint>
 #include <optional>
 #include <type_traits>
+#elif 
+import std.compat;
+#endif
 
 namespace safetyhook {
 template <typename T> constexpr void store(uint8_t* address, const T& value) {

diff --git a/include/safetyhook/vmt_hook.hpp b/include/safetyhook/vmt_hook.hpp
@@ -3,9 +3,13 @@
 
 #pragma once
 
+#ifndef SAFETYHOOK_USE_CXXMODULES
 #include <cstdint>
 #include <expected>
 #include <unordered_map>
+#elif
+import std.compat;
+#endif
 
 #include "safetyhook/allocator.hpp"
 #include "safetyhook/common.hpp"