[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtutil.h

Comparing rxvt-unicode/src/rxvtutil.h (file contents):
Revision 1.56 by root, Fri May 25 07:49:20 2012 UTC vs.
Revision 1.60 by sf-exg, Tue Oct 28 09:05:33 2014 UTC

 #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
 # define THROW(x)
 {
   void *operator new (size_t s);
   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 ()
   {
     for (char **c = begin (); c != end (); c++)
   iterator end () const { return (iterator)simplevec<void *>::end (); }
   T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); }
   const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); }
 };
 #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;
   }
   // void because it makes sense in our context
   void operator =(auto_ptr &a)
   {
-    *this = a.p;
+    reset (a.release ());
-    a.p = 0;
   }
   template<typename A>
   void operator =(auto_ptr<A> &a)
   {
-    *this = a.p;
+    reset (a.release ());
-    a.p = 0;
   }
   T *operator ->() const { return p; }
   T &operator *() const { return *p; }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines