[mc] s/NULL/nullptr/

[simgrid.git] / src / mc / PageStore.cpp

diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp
index 88ea806..7f7e166 100644 (file)
--- a/src/mc/PageStore.cpp
+++ b/src/mc/PageStore.cpp
@@ -11,9 +11,9 @@
 
 #include <xbt.h>
 
-#include "PageStore.hpp"
+#include "src/mc/PageStore.hpp"
 
-#include "mc_mmu.h"
+#include "src/mc/mc_mmu.h"
 
 extern "C" {
 
@@ -48,12 +48,12 @@ PageStore::hash_type mc_hash_page(const void* data)
 // ***** snapshot_page_manager
 
 PageStore::PageStore(size_t size) :
-  memory_(NULL), capacity_(0), top_index_(0)
+  memory_(nullptr), capacity_(0), top_index_(0)
 {
   // Using mmap in order to be able to expand the region
   // by relocating it somewhere else in the virtual memory
   // space:
-  void* memory = ::mmap(NULL, size << xbt_pagebits, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
+  void* memory = ::mmap(nullptr, size << xbt_pagebits, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
   if (memory == MAP_FAILED) {
     xbt_die("Could not mmap initial snapshot pages.");
   }
@@ -171,7 +171,7 @@ std::size_t PageStore::store_page(void* page)
 
 #include <memory>
 
-#include "mc/PageStore.hpp"
+#include "src/mc/PageStore.hpp"
 
 static int value = 0;
 
@@ -182,11 +182,9 @@ static void new_content(void* data, std::size_t size)
 
 static void* getpage()
 {
-  return mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+  return mmap(nullptr, getpagesize(), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
 }
 
-extern "C" {
-
 XBT_TEST_SUITE("mc_page_store", "Page store");
 
 XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the store")
@@ -235,8 +233,6 @@ XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the sto
   xbt_test_assert(store->size()==2, "Bad size");
 }
 
-}
-
 #endif /* SIMGRID_TEST */
 
 }