Apply requested changes

OpenLoco · Jan 24, 2018 · 46fb400 · 46fb400
1 parent ab4b4a7
commit 46fb400
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,6 +141,7 @@ endif()
 
 if (APPLE)
     target_link_libraries(${PROJECT} "-framework Cocoa")
+    target_compile_definitions(${PROJECT} PRIVATE COMPAT_STD_BYTE=1)
 endif ()
 
 if(EXISTS /Users/Marijn/Downloads/SDL2-2.0.7/build/libSDL2.dylib)

diff --git a/src/openloco/interop/hook.cpp b/src/openloco/interop/hook.cpp
@@ -216,7 +216,7 @@ namespace openloco::interop
     static void* _smallHooks;
     static uint8_t* _offset;
 
-    static void* makeJump(uint32_t address, void* fn)
+    static void* make_jump(uint32_t address, void* fn)
     {
 
         if (!_smallHooks)
@@ -262,7 +262,7 @@ namespace openloco::interop
     {
         uint8_t data[4] = { 0 };
 
-        void* hook = makeJump(address, fn);
+        void* hook = make_jump(address, fn);
 
         uintptr_t addr = reinterpret_cast<uintptr_t>(hook);
 

diff --git a/src/openloco/interop/hooks.cpp b/src/openloco/interop/hooks.cpp
@@ -1,4 +1,4 @@
-#include <assert.h>
+#include <cassert>
 #include <cstdio>
 #include <cstring>
 #include <system_error>

diff --git a/src/openloco/interop/interop.hpp b/src/openloco/interop/interop.hpp
@@ -7,6 +7,15 @@
 
 #define assert_struct_size(x, y) static_assert(sizeof(x) == (y), "Improper struct size")
 
+#ifdef COMPAT_STD_BYTE
+namespace std
+{
+    enum class byte : unsigned char
+    {
+    };
+}
+#endif
+
 namespace openloco::interop
 {
 
@@ -157,10 +166,10 @@ namespace openloco::interop
     private:
         uintptr_t begin = 0;
         uintptr_t end = 0;
-        std::vector<uint8_t> state;
+        std::vector<std::byte> state;
 
     public:
-        const std::vector<uint8_t>& get_state() const
+        const std::vector<std::byte>& get_state() const
         {
             return state;
         }