From 0e507ae031768deceab236a41d1bbe9fb5123cea Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 5 Jun 2014 08:16:59 +0200 Subject: various: remove SAL_THROW macro Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494 --- salhelper/source/simplereferenceobject.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'salhelper/source/simplereferenceobject.cxx') diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index 2c5af54eb7a4..f2ec5a792477 100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -24,20 +24,18 @@ using salhelper::SimpleReferenceObject; -SimpleReferenceObject::~SimpleReferenceObject() SAL_THROW(()) +SimpleReferenceObject::~SimpleReferenceObject() { OSL_ASSERT(m_nCount == 0); } void * SimpleReferenceObject::operator new(std::size_t nSize) - SAL_THROW((std::bad_alloc)) { return ::operator new(nSize); } void * SimpleReferenceObject::operator new(std::size_t nSize, std::nothrow_t const &) - SAL_THROW(()) { #if defined WNT return ::operator new(nSize); @@ -47,13 +45,12 @@ void * SimpleReferenceObject::operator new(std::size_t nSize, #endif // WNT } -void SimpleReferenceObject::operator delete(void * pPtr) SAL_THROW(()) +void SimpleReferenceObject::operator delete(void * pPtr) { ::operator delete(pPtr); } void SimpleReferenceObject::operator delete(void * pPtr, std::nothrow_t const &) - SAL_THROW(()) { #if defined WNT ::operator delete(pPtr); // WNT lacks a global nothrow operator delete... -- cgit