Merge branches 'master' and 'master' of github.com:simgrid/simgrid

[simgrid.git] / src / smpi / smpi_shared.cpp

diff --git a/src/smpi/smpi_shared.cpp b/src/smpi/smpi_shared.cpp
index c72dad5..e5f24d6 100644 (file)
--- a/src/smpi/smpi_shared.cpp
+++ b/src/smpi/smpi_shared.cpp
@@ -38,7 +38,6 @@
 
 #include "private.h"
 #include "private.hpp"
-#include "smpi/smpi_shared_malloc.hpp"
 #include "xbt/dict.h"
 #include "xbt/ex.hpp"
 #include <errno.h>
@@ -87,7 +86,7 @@ public:
     return filename_length == that.filename_length && line == that.line &&
            std::memcmp(filename, that.filename, filename_length) == 0;
   }
-  bool operator!=(smpi_source_location const& that) const { return !(*this == that); }
+  bool operator!=(smpi_source_location const& that) const { return not(*this == that); }
 };
 }
 
@@ -226,8 +225,9 @@ void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int
   char *huge_page_mount_point = xbt_cfg_get_string("smpi/shared-malloc-hugepage");
   bool use_huge_page = huge_page_mount_point[0] != '\0';
 #ifndef MAP_HUGETLB /* If the system header don't define that mmap flag */
-    xbt_assert(!use_huge_page, "Huge pages are not available on your system, you cannot use the smpi/shared-malloc-hugepage option.");
-    use_huge_page = 0;
+  xbt_assert(not use_huge_page,
+             "Huge pages are not available on your system, you cannot use the smpi/shared-malloc-hugepage option.");
+  use_huge_page = 0;
 #endif
   smpi_shared_malloc_blocksize = static_cast<unsigned long>(xbt_cfg_get_double("smpi/shared-malloc-blocksize"));
   void *mem, *allocated_ptr;