research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added guards against predefinitions of AssertThrows

Browse source
This commit is contained in:
Harry Moffat 2009-08-11 18:38:48 +00:00
parent 5136b40395
commit 38c73aa215
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cantera/src/base/ctexceptions.h
View file

@ -180,9 +180,15 @@ namespace Cantera {
#define STR_TRACE (std::string(__FILE__) + ":" + XSTR_TRACE_LINE(__LINE__))
#ifdef NDEBUG
#ifndef AssertTrace
# define AssertTrace(expr) ((void) (0))
#endif
#ifndef AssertThrow
# define AssertThrow(expr, procedure) ((void) (0))
#endif
#ifndef AssertThrowMsg
# define AssertThrowMsg(expr,procedure, message) ((void) (0))
#endif
#else
//! Assertion must be true or an error is thrown
@ -195,7 +201,9 @@ namespace Cantera {
*
* @ingroup errorhandling
*/
#ifndef AssertTrace
# define AssertTrace(expr) ((expr) ? (void) 0 : throw Cantera::CanteraError(STR_TRACE, std::string("failed assert: ") + #expr))
#endif
//! Assertion must be true or an error is thrown
/*!
@ -206,7 +214,9 @@ namespace Cantera {
* @param procedure Character string or std:string expression indicating the procedure where the assertion failed
* @ingroup errorhandling
*/
#ifndef AssertThrow
# define AssertThrow(expr, procedure) ((expr) ? (void) 0 : throw Cantera::CanteraError(procedure, std::string("failed assert: ") + #expr))
#endif
//! Assertion must be true or an error is thrown
/*!
@ -222,8 +232,13 @@ namespace Cantera {
*
* @ingroup errorhandling
*/
#ifndef AssertThrowMsg
# define AssertThrowMsg(expr, procedure, message) ((expr) ? (void) 0 : throw Cantera::CanteraError(procedure + std::string(": at failed assert: \"") + std::string(#expr) + std::string("\""), message))
#endif
#endif
}