--- rxvt-unicode/src/rxvtutil.h	2012/05/25 18:49:59	1.57
+++ rxvt-unicode/src/rxvtutil.h	2014/11/10 12:14:48	1.61
@@ -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,80 +93,7 @@
 };
 #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
-{
-  T *p;
-
-  auto_ptr ()     : p (0) { }
-
-  explicit
-  auto_ptr (T *a) : p (a) { }
-
-  auto_ptr (auto_ptr &a)
-  {
-    p = a.p;
-    a.p = 0;
-  }
-
-  template<typename A>
-  auto_ptr (auto_ptr<A> &a)
-  {
-    p = a.p;
-    a.p = 0;
-  }
-
-  ~auto_ptr ()
-  {
-    delete p;
-  }
-
-  void reset (T *a)
-  {
-    delete p;
-    p = a;
-  }
-
-  // void because it makes sense in our context
-  void operator =(auto_ptr &a)
-  {
-    reset (a.release ());
-  }
-
-  template<typename A>
-  void operator =(auto_ptr<A> &a)
-  {
-    reset (a.release ());
-  }
-
-  T *operator ->() const { return p; }
-  T &operator *() const { return *p; }
-
-  operator T *()  { return p; }
-  T *get () const { return p; }
-
-  T *release()
-  {
-    T *r = p;
-    p = 0;
-    return r;
-  }
-};
-
-typedef auto_ptr<char> auto_str;
+typedef estl::scoped_array<char> auto_str;
 
 #endif