X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..7cdbe5b848fd1f600182c38fcd1b7268130dc9c9:/src/mc/mc_pair.cpp

diff --git a/src/mc/mc_pair.cpp b/src/mc/mc_pair.cpp
index 7f754cd35e..345a8f2553 100644
--- a/src/mc/mc_pair.cpp
+++ b/src/mc/mc_pair.cpp
@@ -1,19 +1,22 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt.h>
-#include "mc_liveness.h"
-#include "mc_private.h"
+#include <xbt/dynar.h>
+#include <xbt/sysdep.h>
 
-extern "C" {
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
 
-mc_pair_t MC_pair_new()
+namespace simgrid {
+namespace mc {
+
+simgrid::mc::Pair* pair_new()
 {
-  mc_pair_t p = NULL;
-  p = xbt_new0(s_mc_pair_t, 1);
+  simgrid::mc::Pair* p = nullptr;
+  p = xbt_new0(simgrid::mc::Pair, 1);
   p->num = ++mc_stats->expanded_pairs;
   p->exploration_started = 0;
   p->search_cycle = 0;
@@ -21,19 +24,15 @@ mc_pair_t MC_pair_new()
   return p;
 }
 
-void MC_pair_delete(mc_pair_t p)
+void pair_delete(simgrid::mc::Pair* p)
 {
-  p->automaton_state = NULL;
+  p->automaton_state = nullptr;
   if(p->visited_pair_removed)
     MC_state_delete(p->graph_state, 1);
   xbt_dynar_free(&(p->atomic_propositions));
   xbt_free(p);
-  p = NULL;
-}
-
-void mc_pair_free_voidp(void *p)
-{
-  MC_pair_delete((mc_pair_t) * (void **) p);
+  p = nullptr;
 }
 
 }
+}
\ No newline at end of file