Merge with master and fix conflicts

[simgrid.git] / src / xbt / ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index f383208..bba15a6 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -223,6 +223,9 @@ const char *xbt_ex_catname(xbt_errcat_t cat)
     return "tracing error";
   case io_error:
     return "io error";
+  case vm_error:
+    return "vm error";
+
   }
   return "INVALID ERROR";
 }