Ticket #8839: list2.patch

common/list.h

@@ -26 +26 @@
 #define COMMON_LIST_H
 
 #include "common/scummsys.h"
+#include "common/noncopyable.h"
 
 namespace Common {
 
@@ -133 +134 @@
                 insert(begin(), list.begin(), list.end());
         }
 
-        ~List() {
+        virtual ~List() {
                 clear();
                 delete _anchor;
         }
@@ -161 +162 @@
                         insert(pos, *first);
         }
 
-        iterator erase(iterator pos) {
+        virtual iterator erase(iterator pos) {
                 assert(pos != end());
 
                 NodeBase *next = pos._node->_next;
@@ -173 +174 @@
                 return iterator(next);
         }
 
-        iterator reverse_erase(iterator pos) {
+        virtual iterator reverse_erase(iterator pos) {
                 assert(pos != end());
 
                 NodeBase *next = pos._node->_next;
@@ -261 +262 @@
         }
 };
 
+template<class T>
+class ManagedList : public List<T*>, public NonCopyable {
+        typedef List<T*> Base;
+public:
+        typedef typename List<T*>::iterator iterator;
+        typedef typename List<T*>::const_iterator const_iterator;
+        typedef typename List<T*>::value_type value_type;
+
+        iterator erase(iterator pos) {
+                if (pos != Base::end())
+                        delete *pos;
+                return Base::erase(pos);
+        }
+
+        iterator extract(iterator pos) {
+                return Base::erase(pos);
+        }
+
+        iterator reverse_erase(iterator pos) {
+                if (pos != Base::end())
+                        delete *pos;
+                return Base::reverse_erase(pos);
+        }
+
+        iterator reverse_extract(iterator pos) {
+                return Base::reverse_erase(pos);
+        }
+};
+
 } // End of namespace Common
 
 #endif