A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix tracing tests
[simgrid.git]
/
src
/
xbt
/
ex.cpp
diff --git
a/src/xbt/ex.cpp
b/src/xbt/ex.cpp
index da1dc698b46322c580b165eae1379f49c8492814..9115b407e05aa1d6520b22ef4dcf449d9c685b1d 100644
(file)
--- a/
src/xbt/ex.cpp
+++ b/
src/xbt/ex.cpp
@@
-1,7
+1,6
@@
/* ex - Exception Handling */
/* ex - Exception Handling */
-/* Copyright (c) 2005-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2005-2017. The SimGrid Team. All rights reserved. */
/* Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> */
/* Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/> */
/* Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> */
/* Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/> */
@@
-56,16
+55,11
@@
#include "xbt/str.h"
#include "src/xbt_modinter.h" /* backtrace initialization headers */
#include "xbt/str.h"
#include "src/xbt_modinter.h" /* backtrace initialization headers */
-#include "src/xbt/ex_interface.h"
#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");
#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");
-xbt_ex::~xbt_ex() {}
-
-void _xbt_throw(
- char* message, xbt_errcat_t errcat, int value,
- const char* file, int line, const char* func)
+void _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, int line, const char* func)
{
xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func), message);
free(message);
{
xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func), message);
free(message);
@@
-112,6
+106,8
@@
const char *xbt_ex_catname(xbt_errcat_t cat)
return "io error";
case vm_error:
return "vm error";
return "io error";
case vm_error:
return "vm error";
+ default:
+ return "INVALID ERROR";
}
return "INVALID ERROR";
}
}
return "INVALID ERROR";
}
@@
-231,10
+227,10
@@
XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling")
c = 1;
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
- if (
!(ex.category == 1 && ex.value == 2 && !
strcmp(ex.what(), "blah")))
+ if (
not(ex.category == 1 && ex.value == 2 && not
strcmp(ex.what(), "blah")))
xbt_test_fail("unexpected exception contents");
}
xbt_test_fail("unexpected exception contents");
}
- if (
!
c)
+ if (
not
c)
xbt_test_fail("xbt_ex_free not executed");
}
#endif /* SIMGRID_TEST */
xbt_test_fail("xbt_ex_free not executed");
}
#endif /* SIMGRID_TEST */