summaryrefslogtreecommitdiffstats
path: root/src/collision
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/collision
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/collision')
-rw-r--r--src/collision/ColModel.cpp4
-rw-r--r--src/collision/ColModel.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/collision/ColModel.cpp b/src/collision/ColModel.cpp
index 2071369e..944f76d8 100644
--- a/src/collision/ColModel.cpp
+++ b/src/collision/ColModel.cpp
@@ -36,7 +36,7 @@ CColModel::~CColModel(void)
//--LCS: no pool used, but maybe we better keep it?
void*
-CColModel::operator new(size_t)
+CColModel::operator new(size_t) throw()
{
CColModel* node = CPools::GetColModelPool()->New();
assert(node);
@@ -44,7 +44,7 @@ CColModel::operator new(size_t)
}
void
-CColModel::operator delete(void *p, size_t)
+CColModel::operator delete(void *p, size_t) throw()
{
CPools::GetColModelPool()->Delete((CColModel*)p);
}
diff --git a/src/collision/ColModel.h b/src/collision/ColModel.h
index 64911db8..ce6dcd6d 100644
--- a/src/collision/ColModel.h
+++ b/src/collision/ColModel.h
@@ -35,8 +35,8 @@ struct CColModel
void SetLinkPtr(CLink<CColModel*>*);
void GetTrianglePoint(CVector &v, int i) const;
- void *operator new(size_t);
- void operator delete(void *p, size_t);
+ void *operator new(size_t) throw();
+ void operator delete(void *p, size_t) throw();
CColModel& operator=(const CColModel& other);
bool Write(base::cRelocatableChunkWriter &writer, bool allocSpace);