From: robertc <>
Date: Mon, 27 Jan 2003 06:23:22 +0000 (+0000)
Subject: Summary: Make operator new and delete STL compatible.
X-Git-Tag: SQUID_3_0_PRE1~432
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58173bbae1359ef0857f0b039755b1e1df4ada12;p=thirdparty%2Fsquid.git

Summary: Make operator new and delete STL compatible.
Keywords:

	Operator new and delete need the same signature as the STL uses
	for safe interoperation with any STL headers.
---

diff --git a/include/util.h b/include/util.h
index 838cf696d8..24e779ef60 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.67 2003/01/23 00:36:48 robertc Exp $
+ * $Id: util.h,v 1.68 2003/01/26 23:23:22 robertc Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -82,19 +82,20 @@ SQUIDCEXTERN void Tolower(char *);
 SQUIDCEXTERN void xfree(void *);
 SQUIDCEXTERN void xxfree(const void *);
 #ifdef __cplusplus
-inline void *operator new(size_t size)
+#include <new>
+inline void *operator new(size_t size) throw (std::bad_alloc)
 {
     return xmalloc(size);
 }
-inline void operator delete (void *address)
+inline void operator delete (void *address) throw()
 {
     xfree (address);
 }
-inline void *operator new[] (size_t size)
+inline void *operator new[] (size_t size) throw (std::bad_alloc)
 {
     return xmalloc(size);
 }
-inline void operator delete[] (void *address)
+inline void operator delete[] (void *address) throw()
 {
     xfree (address);
 }