From 954676b700e711f38ec4d286d33d5427d3f4ca46 Mon Sep 17 00:00:00 2001
From: degomme <augustin.degomme@unibas.ch>
Date: Sat, 24 Oct 2015 23:52:26 +0200
Subject: [PATCH] try to fix some compilation erros

---
 src/mc/DwarfExpression.hpp                         | 6 +++---
 src/mc/mc_global.cpp                               | 6 ++++--
 teshsuite/mc/dwarf_expression/dwarf_expression.cpp | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index 7a64654cfe..946f83cef4 100644
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -12,8 +12,8 @@ namespace dwarf {
 
 class evaluation_error : std::runtime_error {
 public:
-  evaluation_error(const char* what) : std::runtime_error(what) {}
-  ~evaluation_error();
+  evaluation_error(const char* what): std::runtime_error(what) {}
+  ~evaluation_error() noexcept(true);
 };
 
 struct ExpressionContext {
@@ -90,4 +90,4 @@ void execute(simgrid::dwarf::DwarfExpression const& expression,
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index ccda078138..7ead3c543c 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -508,8 +508,10 @@ void MC_print_statistics(mc_stats_t stats)
     if (_sg_mc_comms_determinism)
       XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes");
   }
-  if (getenv("SIMGRID_MC_SYSTEM_STATISTICS"))
-    system("free");
+  if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){
+    int ret=system("free");
+    if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret);
+  }
 }
 
 void MC_automaton_load(const char *file)
diff --git a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
index fa42b88066..e9655c8da7 100644
--- a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
+++ b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
@@ -39,7 +39,7 @@ uintptr_t eval_binary_operation(
     simgrid::dwarf::execute(ops, 3, state, stack);
   }
   catch(std::runtime_error& e) {
-    assert(("Expression evaluation error", false));
+    fprintf(stderr,"Expression evaluation error");
   }
 
   assert(stack.size() == 1);
@@ -60,7 +60,7 @@ void basic_test(simgrid::dwarf::ExpressionContext const& state) {
   try {
     ops[0].atom = DW_OP_drop;
     simgrid::dwarf::execute(ops, 1, state, stack);
-    assert(("Exception expected", false));
+    fprintf(stderr,"Exception expected");
   }
   catch(simgrid::dwarf::evaluation_error& e) {}
 
@@ -122,7 +122,7 @@ void basic_test(simgrid::dwarf::ExpressionContext const& state) {
 
   }
   catch(std::runtime_error& e) {
-    assert(("Expression evaluation error", false));
+    fprintf(stderr,"Expression evaluation error");
   }
 }
 
@@ -145,7 +145,7 @@ void test_deref(simgrid::dwarf::ExpressionContext const& state) {
 
   }
   catch(std::runtime_error& e) {
-    assert(("Expression evaluation error", false));
+    fprintf(stderr,"Expression evaluation error");
   }
 }
 
-- 
2.20.1