From 797bcdee63c2e53e8b662c6ff416578ba78b60fd Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 23 Jun 2005 09:52:34 +0000 Subject: [PATCH] Corrected overloading of operator new (icc) --- HLT/MUON/src/new.cxx | 4 ++-- HLT/MUON/src/new.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HLT/MUON/src/new.cxx b/HLT/MUON/src/new.cxx index ed973df0c10..22072319beb 100644 --- a/HLT/MUON/src/new.cxx +++ b/HLT/MUON/src/new.cxx @@ -110,7 +110,7 @@ namespace }; // end of namespace -void* operator new (size_t size) throw (dHLT::OutOfMemory) +void* operator new (size_t size) throw (std::bad_alloc) { void* memory = malloc(size); if (memory == NULL) dHLT::ThrowOutOfMemory(); @@ -120,7 +120,7 @@ void* operator new (size_t size) throw (dHLT::OutOfMemory) }; -void* operator new [] (size_t size) throw (dHLT::OutOfMemory) +void* operator new [] (size_t size) throw (std::bad_alloc) { void* memory = malloc(size); if (memory == NULL) dHLT::ThrowOutOfMemory(); diff --git a/HLT/MUON/src/new.hpp b/HLT/MUON/src/new.hpp index f68dfcbc2da..e0479d0fbab 100644 --- a/HLT/MUON/src/new.hpp +++ b/HLT/MUON/src/new.hpp @@ -14,8 +14,8 @@ These new operators throw dHLT::OutOfMemory exceptions if the system is out of memory. */ -void* operator new (size_t size) throw (dHLT::OutOfMemory); -void* operator new [] (size_t size) throw (dHLT::OutOfMemory); +void* operator new (std::size_t size) throw (std::bad_alloc); +void* operator new [] (std::size_t size) throw (std::bad_alloc); void operator delete (void* memory) throw (); void operator delete [] (void* memory) throw (); -- 2.31.1