summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-01-05 13:01:54 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-01-05 13:01:54 +0100
commit719c3539ee5877e463975ce7050b8dc014571cdd (patch)
tree15ec564f46fb325124314e320f35b87151ec5f0b /salhelper
parent925fe19488f73b78df72f2721c5209213f25ecc4 (diff)
parentf8895cacc72c7f0970f08dc190198224f06601f3 (diff)
CWS-TOOLING: integrate CWS sb116
Diffstat (limited to 'salhelper')
-rwxr-xr-xsalhelper/source/simplereferenceobject.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index 7a09031fc..3f46cc9bc 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);