diff --git a/BaseLib/Error.h b/BaseLib/Error.h index f2894fd2066b21dcc079d053abce7c590bed2421..1fa8bd9adf28ed15e12157c48a066c7dd1ea4e9d 100644 --- a/BaseLib/Error.h +++ b/BaseLib/Error.h @@ -10,15 +10,30 @@ #ifndef BASELIB_ERROR_H #define BASELIB_ERROR_H +#ifdef OGS_FATAL_ABORT +#include <cstdlib> +#endif #include <stdexcept> +#ifdef OGS_FATAL_ABORT +#include <logog/include/logog.hpp> +#endif + #include "StringTools.h" #include "FileTools.h" #define OGS_STR(x) #x #define OGS_STRINGIFY(x) OGS_STR(x) #define OGS_LOCATION " at " + BaseLib::extractBaseName(__FILE__) + ", line " OGS_STRINGIFY(__LINE__) +#ifdef OGS_FATAL_ABORT +#define OGS_FATAL(fmt, ...)\ + {\ + ERR("%s", BaseLib::format(fmt, ##__VA_ARGS__).data());\ + std::abort();\ + } +#else #define OGS_FATAL(fmt, ...)\ throw std::runtime_error(BaseLib::format(fmt, ##__VA_ARGS__) + OGS_LOCATION); +#endif #endif //BASELIB_ERROR_H