No need for timestamps in logs.

[simgrid.git] / teshsuite / xbt / mmalloc / mmalloc_test.cpp

diff --git a/teshsuite/xbt/mmalloc/mmalloc_test.cpp b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
index c5706b6fd536cc02778e57b1fa859a950827ef01..759f09e473768dcb24aa4c6078890c60d5bf4e5b 100644 (file)
--- a/teshsuite/xbt/mmalloc/mmalloc_test.cpp
+++ b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2014, 2016-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,14 +6,16 @@
 
 #include "xbt/mmalloc.h"
 #include "xbt.h"
-#include <stdio.h>
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
+#include <xbt/ex.hpp>
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,"this test");
 
 #define BUFFSIZE 204800
@@ -38,11 +40,12 @@ int main(int argc, char**argv)
 
   XBT_INFO("HeapA allocated");
 
-  int i, size;
+  int i;
+  int size;
   for (i = 0; i < TESTSIZE; i++) {
     size = size_of_block(i);
     pointers[i] = mmalloc(heapA, size);
-    XBT_INFO("%d bytes allocated with offset %tx", size, ((char*)pointers[i])-((char*)heapA));
+    XBT_INFO("%d bytes allocated with offset %zx", size, (size_t)((char*)pointers[i] - (char*)heapA));
   }
   XBT_INFO("All blocks were correctly allocated. Free every second block");
   for (i = 0; i < TESTSIZE; i+=2) {
@@ -68,7 +71,7 @@ int main(int argc, char**argv)
     } catch(xbt_ex& e) {
       gotit = true;
     }
-    if (!gotit)
+    if (not gotit)
       xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
   }
 
@@ -80,7 +83,7 @@ int main(int argc, char**argv)
     } catch(xbt_ex& e) {
       gotit = true;
     }
-    if (!gotit)
+    if (not gotit)
       xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
   }