diff options
author | thb <thb@openoffice.org> | 2010-01-28 12:49:43 +0100 |
---|---|---|
committer | thb <thb@openoffice.org> | 2010-01-28 12:49:43 +0100 |
commit | 153ee9c87cf2138cf2df9f79417c24348ff56fad (patch) | |
tree | 4ff1c3fa22217d85f4959cac98b435e43c92098d /salhelper | |
parent | 879ae64d59b53c6d7e28d991eb6c8dd9d6d51f04 (diff) | |
parent | a2cadf4bc167c9a5ad534af03f7960c6ef477c05 (diff) |
eraser01: merge with DEV300 m70
Diffstat (limited to 'salhelper')
-rwxr-xr-x | salhelper/source/simplereferenceobject.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index 2d80f246d171..36036feb5986 100755 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -69,7 +69,7 @@ void SimpleReferenceObject::operator delete(void * pPtr) SAL_THROW(()) void SimpleReferenceObject::operator delete(void * pPtr, std::nothrow_t const &) SAL_THROW(()) { -#if defined WNT || (defined IRIX && !defined GCC) +#if defined WNT ::operator delete(pPtr); // WNT lacks a global nothrow operator delete... #else // WNT ::operator delete(pPtr, std::nothrow); |