summaryrefslogtreecommitdiffstats
path: root/src/entities
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/entities
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/entities')
-rw-r--r--src/entities/Dummy.cpp4
-rw-r--r--src/entities/Dummy.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/entities/Dummy.cpp b/src/entities/Dummy.cpp
index 9878b595..d62d2434 100644
--- a/src/entities/Dummy.cpp
+++ b/src/entities/Dummy.cpp
@@ -4,8 +4,8 @@
#include "World.h"
#include "Dummy.h"
-void *CDummy::operator new(size_t sz) { return CPools::GetDummyPool()->New(); }
-void CDummy::operator delete(void *p, size_t sz) { CPools::GetDummyPool()->Delete((CDummy*)p); }
+void *CDummy::operator new(size_t sz) throw() { return CPools::GetDummyPool()->New(); }
+void CDummy::operator delete(void *p, size_t sz) throw() { CPools::GetDummyPool()->Delete((CDummy*)p); }
void
CDummy::Add(void)
diff --git a/src/entities/Dummy.h b/src/entities/Dummy.h
index 84b1ce1a..9b73eefc 100644
--- a/src/entities/Dummy.h
+++ b/src/entities/Dummy.h
@@ -12,8 +12,8 @@ public:
void Add(void);
void Remove(void);
- static void *operator new(size_t);
- static void operator delete(void*, size_t);
+ static void *operator new(size_t) throw();
+ static void operator delete(void*, size_t) throw();
};
bool IsDummyPointerValid(CDummy* pDummy);