--- rxvt-unicode/src/rxvtutil.h	2012/05/25 18:49:59	1.57
+++ rxvt-unicode/src/rxvtutil.h	2014/10/28 09:05:33	1.60
@@ -7,6 +7,8 @@
 #include "ecb.h"
 #include "estl.h"
 
+#include "emman.h"
+
 // increases code size unless -fno-enforce-eh-specs
 #if __GNUC__
 # define NOTHROW
@@ -61,6 +63,10 @@
   void operator delete (void *p, size_t s);
 };
 
+// alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6)
+void *operator new (size_t s) throw (std::bad_alloc);
+void operator delete (void *p) throw ();
+
 struct stringvec : simplevec<char *>
 {
   ~stringvec ()
@@ -87,19 +93,6 @@
 };
 #endif
 
-inline void *
-operator new (size_t size)
-{
-  // TODO: use rxvt_malloc
-  return malloc (size);
-}
-
-inline void
-operator delete (void *p)
-{
-  free (p);
-}
-
 template<typename T>
 struct auto_ptr
 {