Fix count_new.hpp to work w/o dynamic exception specifications
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@289355 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -234,7 +234,10 @@ public:
|
|||||||
MemCounter globalMemCounter((MemCounter::MemCounterCtorArg_()));
|
MemCounter globalMemCounter((MemCounter::MemCounterCtorArg_()));
|
||||||
|
|
||||||
#ifndef DISABLE_NEW_COUNT
|
#ifndef DISABLE_NEW_COUNT
|
||||||
void* operator new(std::size_t s) throw(std::bad_alloc)
|
void* operator new(std::size_t s)
|
||||||
|
#if TEST_STD_VER < 11
|
||||||
|
throw(std::bad_alloc)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
globalMemCounter.newCalled(s);
|
globalMemCounter.newCalled(s);
|
||||||
void* ret = std::malloc(s);
|
void* ret = std::malloc(s);
|
||||||
@@ -243,21 +246,34 @@ void* operator new(std::size_t s) throw(std::bad_alloc)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void operator delete(void* p) throw()
|
void operator delete(void* p)
|
||||||
|
#if TEST_STD_VER < 11
|
||||||
|
throw()
|
||||||
|
#else
|
||||||
|
noexcept
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
globalMemCounter.deleteCalled(p);
|
globalMemCounter.deleteCalled(p);
|
||||||
std::free(p);
|
std::free(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void* operator new[](std::size_t s) throw(std::bad_alloc)
|
void* operator new[](std::size_t s)
|
||||||
|
#if TEST_STD_VER < 11
|
||||||
|
throw(std::bad_alloc)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
globalMemCounter.newArrayCalled(s);
|
globalMemCounter.newArrayCalled(s);
|
||||||
return operator new(s);
|
return operator new(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void operator delete[](void* p) throw()
|
void operator delete[](void* p)
|
||||||
|
#if TEST_STD_VER < 11
|
||||||
|
throw()
|
||||||
|
#else
|
||||||
|
noexcept
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
globalMemCounter.deleteArrayCalled(p);
|
globalMemCounter.deleteArrayCalled(p);
|
||||||
operator delete(p);
|
operator delete(p);
|
||||||
|
|||||||
Reference in New Issue
Block a user