Kaydet (Commit) 3c354ea9 authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Michael Stahl

tdf#43157 - salhelper: convert from OSL_ASSERT to assert

Change-Id: I8691a627bbf78ce83db595053d6e254557641408
Reviewed-on: https://gerrit.libreoffice.org/38506Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst fd0ca411
......@@ -20,6 +20,8 @@
#ifndef INCLUDED_SALHELPER_REFOBJ_HXX
#define INCLUDED_SALHELPER_REFOBJ_HXX
#include <cassert>
#include <sal/types.h>
#include <rtl/alloc.h>
#include <osl/diagnose.h>
......@@ -85,7 +87,7 @@ protected:
*/
virtual ~ReferenceObject()
{
OSL_ASSERT(m_nReferenceCount == 0);
assert(m_nReferenceCount == 0);
}
};
......
......@@ -17,24 +17,24 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "salhelper/simplereferenceobject.hxx"
#include "osl/diagnose.h"
#include <salhelper/simplereferenceobject.hxx>
#include <cassert>
#include <new>
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment