aboutsummaryrefslogtreecommitdiff
path: root/src/jtutil/error_exit.cc
diff options
context:
space:
mode:
authorsvnadmin <svnadmin@f88db872-0e4f-0410-b76b-b9085cfa78c5>2008-06-26 13:51:26 +0000
committersvnadmin <svnadmin@f88db872-0e4f-0410-b76b-b9085cfa78c5>2008-06-26 13:51:26 +0000
commit9716af1598ddfd2ab8ee7198b35cca1df312c4fd (patch)
tree5f903e795434362f0360ee2e3e65a27e6c6601c3 /src/jtutil/error_exit.cc
parent8cb0df53b3d5d615624b9bffdcc11cf13905cfc0 (diff)
Make "Erik" branch the default trunk for AHFinderDirect.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1526 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/jtutil/error_exit.cc')
-rw-r--r--src/jtutil/error_exit.cc17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/jtutil/error_exit.cc b/src/jtutil/error_exit.cc
index ffffa1e..fd8e2d8 100644
--- a/src/jtutil/error_exit.cc
+++ b/src/jtutil/error_exit.cc
@@ -18,12 +18,6 @@
#include "config.h"
#include "stdc.h"
-// everything in this file is inside these namespaces
-namespace AHFinderDirect
- {
-namespace jtutil
- {
-
//******************************************************************************
//
@@ -54,6 +48,9 @@ namespace jtutil
// args... = (in) Any additional arguments are (presumably) used in formatting
// the error message string.
//
+namespace jtutil
+ {
+extern "C"
/*VARARGS*/
int error_exit(int msg_level, const char *format, ...)
{
@@ -78,14 +75,10 @@ if ((len > 0) && (buffer[len-1] == '\n'))
then abort();
else exit(msg_level);
#else
- CCTK_VWarn(msg_level, __LINE__, __FILE__, CCTK_THORNSTRING, "%s", buffer);
+ CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, "%s", buffer);
#endif
// if we got here, evidently msg_level wasn't drastic enough
abort(); /*NOTREACHED*/
}
-
-//******************************************************************************
-
- } // namespace jtutil
- } // namespace AHFinderDirect
+ } // namespace jtutil::