aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkcat <[email protected]>2019-06-21 12:42:55 -0700
committerGitHub <[email protected]>2019-06-21 12:42:55 -0700
commit281e61e4cc4e491c25c78c14cc12b9043a10e973 (patch)
treedb5908ea44f692c5b568fd5b5060501ef1ffe6cf
parent723ab7f15a4bdaa7dd26a8a672057cb0c901f36a (diff)
parent499aa65a4b57328bd9a0d5af0eee450218f2b57c (diff)
Merge pull request #298 from TeamHypersomnia/master
Fix ambiguous calls to destroy_at
-rw-r--r--common/almalloc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/almalloc.h b/common/almalloc.h
index 4bf3a281..d649716c 100644
--- a/common/almalloc.h
+++ b/common/almalloc.h
@@ -85,7 +85,7 @@ inline void destroy(T first, const T end)
{
while(first != end)
{
- destroy_at(std::addressof(*first));
+ al::destroy_at(std::addressof(*first));
++first;
}
}
@@ -96,7 +96,7 @@ inline T destroy_n(T first, N count)
if(count != 0)
{
do {
- destroy_at(std::addressof(*first));
+ al::destroy_at(std::addressof(*first));
++first;
} while(--count);
}