From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 4 May 2016 12:38:37 +0000 (+0200)
Subject: [mc] Remove useless bits in compare.cpp
X-Git-Tag: v3_14~1274^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/84a3bccd6edd7bbc93648d2646e1413ce8114853?hp=c5fa23d0d0ca68403115c1a460e3d7715217523c

[mc] Remove useless bits in compare.cpp
---

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index df86f558f5..e871e48496 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -162,25 +162,6 @@ struct StateComparator {
 // TODO, make this a field of ModelChecker or something similar
 static std::unique_ptr<simgrid::mc::StateComparator> mc_diff_info;
 
-/*********************************** Free functions ************************************/
-
-static void heap_area_pair_free(heap_area_pair_t pair)
-{
-  xbt_free(pair);
-  pair = nullptr;
-}
-
-static void heap_area_pair_free_voidp(void *d)
-{
-  heap_area_pair_free((heap_area_pair_t) * (void **) d);
-}
-
-static void heap_area_free(heap_area_t area)
-{
-  xbt_free(area);
-  area = nullptr;
-}
-
 /************************************************************************************/
 
 static s_heap_area_t make_heap_area(int block, int fragment)
@@ -1039,10 +1020,11 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, s
   malloc_info heapinfo_temp1, heapinfo_temp2;
 
   if (previous == nullptr) {
-    previous =
-        xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
+    previous = xbt_dynar_new(sizeof(heap_area_pair_t), [](void *d) {
+      xbt_free((heap_area_pair_t) * (void **) d); });
     match_pairs = 1;
   }
+
   // Get block number:
   block1 =
       ((char *) area1 -