From 3c354ea9ed8158143110fda56af22d12e750fc2f Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Wed, 7 Jun 2017 22:50:54 +1000 Subject: tdf#43157 - salhelper: convert from OSL_ASSERT to assert Change-Id: I8691a627bbf78ce83db595053d6e254557641408 Reviewed-on: https://gerrit.libreoffice.org/38506 Tested-by: Jenkins Reviewed-by: Michael Stahl --- salhelper/source/simplereferenceobject.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'salhelper/source/simplereferenceobject.cxx') diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index 72e31c429cdc..fcf130d9d192 100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -17,24 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "salhelper/simplereferenceobject.hxx" -#include "osl/diagnose.h" +#include +#include #include using salhelper::SimpleReferenceObject; SimpleReferenceObject::~SimpleReferenceObject() { - OSL_ASSERT(m_nCount == 0); + assert(m_nCount == 0); } -void * SimpleReferenceObject::operator new(std::size_t nSize) +void *SimpleReferenceObject::operator new(std::size_t nSize) { return ::operator new(nSize); } -void * SimpleReferenceObject::operator new(std::size_t nSize, +void *SimpleReferenceObject::operator new(std::size_t nSize, std::nothrow_t const &) { #if defined(_WIN32) -- cgit