aboutsummaryrefslogtreecommitdiff
path: root/loader_launcher_proxy/Memory.cpp
diff options
context:
space:
mode:
authorpg9182 <96569817+pg9182@users.noreply.github.com>2022-08-08 06:12:11 -0400
committerGitHub <noreply@github.com>2022-08-08 11:12:11 +0100
commit5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f (patch)
tree6c55b909fd258251c238bfad9caf83113fd88f33 /loader_launcher_proxy/Memory.cpp
parent286cea5f6280e568f5cb4c953d93993c98625ce4 (diff)
downloadNorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.tar.gz
NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.zip
Fix most clang/mingw issues (#226)
- Fix include case. - Replace MSVC-specific align with standard alignas. - Type fixes. - Delete operator noexcept. - A few other minor issues. - clang-format everything. - Use c++20 instead of c++17. - Rewrite ERROR macro for launcher_wsock32_proxy. - Use a plain ifstream for the audio.cpp wavStream. Note: When compiling with clang, you'll need -municode. Related to #212.
Diffstat (limited to 'loader_launcher_proxy/Memory.cpp')
-rw-r--r--loader_launcher_proxy/Memory.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/loader_launcher_proxy/Memory.cpp b/loader_launcher_proxy/Memory.cpp
index 200246eb..344fa834 100644
--- a/loader_launcher_proxy/Memory.cpp
+++ b/loader_launcher_proxy/Memory.cpp
@@ -1,4 +1,5 @@
#include "pch.h"
+#include "Memory.h"
extern HMODULE hTier0Module;
IMemAlloc** g_ppMemAllocSingleton;
@@ -77,6 +78,12 @@ void* realloc(void* old_ptr, size_t size)
return nullptr;
}
-void* operator new(size_t n) { return malloc(n); }
+void* operator new(size_t n)
+{
+ return malloc(n);
+}
-void operator delete(void* p) { return free(p); }
+void operator delete(void* p) noexcept
+{
+ return free(p);
+}