Merge branch 'master' of https://github.com/Onesphore/simgrid into Onesphore-master

[simgrid.git] / src / mc / snapshot / unitTest / mc_snapshot_unit.cpp

diff --git a/src/mc/snapshot/unitTest/mc_snapshot_unit.cpp b/src/mc/snapshot/unitTest/mc_snapshot_unit.cpp
index b2698ea..ef2d0da 100644 (file)
--- a/src/mc/snapshot/unitTest/mc_snapshot_unit.cpp
+++ b/src/mc/snapshot/unitTest/mc_snapshot_unit.cpp
@@ -15,7 +15,7 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_mmu.hpp"
 #include "src/mc/mc_private.hpp"
-#include "src/mc/mc_snapshot.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
 
 /**************** Class BOOST_tests *************************/
 using simgrid::mc::RegionSnapshot;
@@ -30,8 +30,7 @@ class BOOST_tests {
       RegionSnapshot region0;
       RegionSnapshot region;
     } prologue_return;
-    static prologue_return prologue(int n);
-    static void epilogue(); // common to the below 5 fxs
+    static prologue_return prologue(int n); // common to the below 5 fxs
     static void read_whole_region();
     static void read_region_parts();
     static void compare_whole_region();
@@ -91,7 +90,8 @@ BOOST_tests::prologue_return BOOST_tests::prologue(int n) {
   void* destination = mmap(nullptr, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
   BOOST_CHECK_MESSAGE(source!=MAP_FAILED, "Could not allocate destination memory");
 
-  return {.size = byte_size, .src = source, .dstn = destination, .region0 = std::move(region0), .region = std::move(region)};
+  return {.size = byte_size, .src = source, .dstn = destination, 
+          .region0 = std::move(region0), .region = std::move(region)};
 }
 
 void