summaryrefslogtreecommitdiffstats
path: root/src/collision
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-05-18 06:33:47 +0200
committerSergeanur <s.anureev@yandex.ua>2021-05-18 06:33:47 +0200
commit3596897961224e2cebd93e1f94db37a957808989 (patch)
tree9378d463e73933c90dcf90be93da7c9bac3dbeb1 /src/collision
parentFix quiet police scanner on OpenAL (diff)
parentMerge branch 'miami' of http://git.jacksmininetwork.co.uk/re/re3 into miami (diff)
downloadre3-3596897961224e2cebd93e1f94db37a957808989.tar
re3-3596897961224e2cebd93e1f94db37a957808989.tar.gz
re3-3596897961224e2cebd93e1f94db37a957808989.tar.bz2
re3-3596897961224e2cebd93e1f94db37a957808989.tar.lz
re3-3596897961224e2cebd93e1f94db37a957808989.tar.xz
re3-3596897961224e2cebd93e1f94db37a957808989.tar.zst
re3-3596897961224e2cebd93e1f94db37a957808989.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 49847dbd..2224a804 100644
--- a/src/collision/ColModel.cpp
+++ b/src/collision/ColModel.cpp
@@ -27,7 +27,7 @@ CColModel::~CColModel(void)
}
void*
-CColModel::operator new(size_t)
+CColModel::operator new(size_t) throw()
{
CColModel* node = CPools::GetColModelPool()->New();
assert(node);
@@ -35,7 +35,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 cd5ae651..64f05f76 100644
--- a/src/collision/ColModel.h
+++ b/src/collision/ColModel.h
@@ -33,7 +33,7 @@ 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);
}; \ No newline at end of file