Corrected overloading of operator new (icc)

diff --git a/HLT/MUON/src/new.cxx b/HLT/MUON/src/new.cxx
index ed973df0c10231e602b844b2ab8b967d8e06d683..22072319bebb47bb48ca1ab3ae3f585ffeb63d1a 100644 (file)
--- 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 f68dfcbc2da2401157060ae785785c09bfbedd77..e0479d0fbab8235b797c92d5fae879f43fc24524 100644 (file)
--- 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 ();