From e3a04abeead8a513932f78bb4a53070b2b852aad Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 11 May 2007 17:37:40 +0000 Subject: [PATCH] Added a namespace declaration to Assert commands, that's needed in applications. --- Cantera/src/base/ctexceptions.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cantera/src/base/ctexceptions.h b/Cantera/src/base/ctexceptions.h index 183844fad..ddc06fccb 100755 --- a/Cantera/src/base/ctexceptions.h +++ b/Cantera/src/base/ctexceptions.h @@ -187,7 +187,7 @@ namespace Cantera { * * @ingroup errorhandling */ -# define AssertTrace(expr) ((expr) ? (void) 0 : throw CanteraError(STR_TRACE, std::string("failed assert: ") + #expr)) +# define AssertTrace(expr) ((expr) ? (void) 0 : throw Cantera::CanteraError(STR_TRACE, std::string("failed assert: ") + #expr)) //! Assertion must be true or an error is thrown /*! @@ -198,7 +198,7 @@ namespace Cantera { * @param proc Character string or std:string expression indicating the procedure where the assertion failed * @ingroup errorhandling */ -# define AssertThrow(expr, proc) ((expr) ? (void) 0 : throw CanteraError(proc, std::string("failed assert: ") + #expr)) +# define AssertThrow(expr, proc) ((expr) ? (void) 0 : throw Cantera::CanteraError(proc, std::string("failed assert: ") + #expr)) //! Assertion must be true or an error is thrown /*! @@ -212,7 +212,7 @@ namespace Cantera { * * @ingroup errorhandling */ -# define AssertThrowMsg(expr, proc, message) ((expr) ? (void) 0 : throw CanteraError(proc + std::string(": at failed assert: \"") + std::string(#expr) + std::string("\""), message)) +# define AssertThrowMsg(expr, proc, message) ((expr) ? (void) 0 : throw Cantera::CanteraError(proc + std::string(": at failed assert: \"") + std::string(#expr) + std::string("\""), message)) #endif }