--- rxvt-unicode/src/rxvtutil.h	2012/01/23 14:29:24	1.50
+++ rxvt-unicode/src/rxvtutil.h	2014/11/10 12:14:48	1.61
@@ -1,11 +1,14 @@
 #ifndef RXVT_UTIL_H
 #define RXVT_UTIL_H
 
+#include <new>
 #include <stdlib.h>
 #include <string.h>
 #include "ecb.h"
 #include "estl.h"
 
+#include "emman.h"
+
 // increases code size unless -fno-enforce-eh-specs
 #if __GNUC__
 # define NOTHROW
@@ -16,18 +19,18 @@
 #endif
 
 // various utility functions
-template<typename T, typename U> static inline void min_it (T &a, U b) {    a = a < (T)b ? a : (T)b; }
-template<typename T, typename U> static inline void max_it (T &a, U b) {    a = a > (T)b ? a : (T)b; }
+template<typename T, typename U> static inline void min_it (T &a, U b) { a = a < (T)b ? a : (T)b; }
+template<typename T, typename U> static inline void max_it (T &a, U b) { a = a > (T)b ? a : (T)b; }
 
 template<typename T, typename U, typename V> static inline T    clamp    (T  v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; }
 template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) {    v = v < (T)a ? a : v >(T)b ? b : v; }
 
-template<typename T> static inline T squared_diff (T a, T b) { return (a-b)*(a-b); }
+template<typename T> static inline T squared_diff (T a, T b) { return (a - b) * (a - b); }
 
 // linear interpolation
 template<typename T, typename U, typename P>
-static inline
-T lerp (T a, U b, P p)
+static inline T
+lerp (T a, U b, P p)
 {
   return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
 }
@@ -60,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 ()
@@ -86,66 +93,7 @@
 };
 #endif
 
-template<typename T>
-struct auto_ptr
-{
-  T *p;
-
-  auto_ptr () : p (0) { }
-  auto_ptr (T *a) : p (a) { }
-
-  auto_ptr (auto_ptr<T> &a)
-  {
-    p = a.p;
-    a.p = 0;
-  }
-
-  template<typename A>
-  auto_ptr (auto_ptr<A> &a)
-  {
-    p = a.p;
-    a.p = 0;
-  }
-
-  ~auto_ptr ()
-  {
-    free (p);
-  }
-
-  // void because it makes sense in our context
-  void operator = (T *a)
-  {
-    free (p);
-    p = a;
-  }
-
-  void operator = (auto_ptr &a)
-  {
-    *this = a.p;
-    a.p = 0;
-  }
-
-  template<typename A>
-  void operator = (auto_ptr<A> &a)
-  {
-    *this = a.p;
-    a.p = 0;
-  }
-
-  operator T * () const { return p; }
-
-  T *operator -> () const { return p; }
-  T &operator * () const { return *p; }
-
-  T *get ()
-  {
-    T *r = p;
-    p = 0;
-    return r;
-  }
-};
-
-typedef auto_ptr<char> auto_str;
+typedef estl::scoped_array<char> auto_str;
 
 #endif