From 217edbfa65989dab40bc89861da071237569124d Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 17 Dec 2003 17:12:37 +0000
Subject: INTEGRATION: CWS geordi2q11 (1.1.78); FILE MERGED 2003/12/16 14:41:56
 hr 1.1.78.1: #111934#: join CWS ooo111fix1

---
 salhelper/source/simplereferenceobject.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'salhelper/source/simplereferenceobject.cxx')

diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index c468159ca16a..8ae38600694b 100755
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simplereferenceobject.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: sb $ $Date: 2001-06-05 15:21:32 $
+ *  last change: $Author: vg $ $Date: 2003-12-17 18:12:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,7 +106,7 @@ void SimpleReferenceObject::operator delete(void * pPtr,
                                             std::nothrow_t const & rNothrow)
     SAL_THROW(())
 {
-#if defined WNT
+#if defined WNT || (defined IRIX && !defined GCC)
     ::operator delete(pPtr); // WNT lacks a global nothrow operator delete...
 #else // WNT
     ::operator delete(pPtr, rNothrow);
-- 
cgit