summaryrefslogtreecommitdiffstats
path: root/src/rw/MemoryMgr.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-05-18 07:12:47 +0200
committerSergeanur <s.anureev@yandex.ua>2021-05-18 07:12:47 +0200
commit19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab (patch)
tree3cc2f99dca4e911a1bcfa17860dd2e30a99d6754 /src/rw/MemoryMgr.cpp
parentMerge branch 'miami' into lcs (diff)
parentMerge pull request 'Pool fixes + peds not forming circle fix' (#4) from erorcun/re3:miami into miami (diff)
downloadre3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.tar
re3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.tar.gz
re3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.tar.bz2
re3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.tar.lz
re3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.tar.xz
re3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.tar.zst
re3-19dd95a1cb6ce7bf8cc65b4b8bfbb4fab241a7ab.zip
Diffstat (limited to 'src/rw/MemoryMgr.cpp')
-rw-r--r--src/rw/MemoryMgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rw/MemoryMgr.cpp b/src/rw/MemoryMgr.cpp
index 2379692c..b9cff043 100644
--- a/src/rw/MemoryMgr.cpp
+++ b/src/rw/MemoryMgr.cpp
@@ -28,10 +28,10 @@ RwMemoryFunctions memFuncs = {
#ifdef USE_CUSTOM_ALLOCATOR
// game seems to be using heap directly here, but this is nicer
-void *operator new(size_t sz) { return MemoryMgrMalloc(sz); }
-void *operator new[](size_t sz) { return MemoryMgrMalloc(sz); }
-void operator delete(void *ptr) noexcept { MemoryMgrFree(ptr); }
-void operator delete[](void *ptr) noexcept { MemoryMgrFree(ptr); }
+void *operator new(size_t sz) throw() { return MemoryMgrMalloc(sz); }
+void *operator new[](size_t sz) throw() { return MemoryMgrMalloc(sz); }
+void operator delete(void *ptr) throw() { MemoryMgrFree(ptr); }
+void operator delete[](void *ptr) throw() { MemoryMgrFree(ptr); }
#endif
void*