Changeset 4867 for branches/erijo-dev

Timestamp:

03/18/07 21:42:00 (21 months ago)

Author:

erijo

Message:

Add support to ObjectDeleter? for deleting the second value in a pair.

Location:

branches/erijo-dev/licq/src/utils

Files:

• misc.h (modified) (2 diffs)
• tests/misctest.cpp (modified) (2 diffs)

branches/erijo-dev/licq/src/utils/misc.h

@@ -20 +20 @@
 #ifndef LICQ_MISC_H
 #define LICQ_MISC_H
+
+#include <utility>
 
 namespace Licq
@@ -44 +46 @@
     delete ptr;
   }
+
+  /// Delete pair.second
+  template<typename T1, typename T2>
+  void operator()(const std::pair<T1, T2*>& pair) const
+  {
+    delete pair.second;
+  }
 };
 

branches/erijo-dev/licq/src/utils/tests/misctest.cpp

@@ -22 +22 @@
 #include "utils/misc.h"
 #include <list>
+#include <map>
 #include <vector>
 
@@ -55 +56 @@
   std::for_each(vector.rbegin(), vector.rend(), ObjectDeleter());
   BOOST_CHECK_EQUAL(TCounter::Counter, 0);
+
+  std::map<int, TCounter*> map;
+  for (int i = 0; i < 321; ++i)
+    map[i] = new TCounter();
+
+  BOOST_CHECK_EQUAL(TCounter::Counter, 321);
+  std::for_each(map.begin(), map.end(), ObjectDeleter());
+  BOOST_CHECK_EQUAL(TCounter::Counter, 0);
 }