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
commitf52fb6272ab6d15a72b45707f2599359b7627604 (patch)
treedfea1075aab5962b568041cbc3a7a8f5ea763aeb /salhelper
parentfed92864b28a32bee9d7cd8bfffd5a4b523e18d4 (diff)
parent4a96552f4966f204a15287d3c1a9340012792661 (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 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);