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

Add a constructor for CanteraError that uses format strings

Browse source
This commit is contained in:
Ray Speth 2015-09-07 17:15:52 -04:00
parent 16143b47b6
commit 745db409a6
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/cantera/base/ctexceptions.h
View file

@ -11,6 +11,7 @@
#include <exception>
#include <string>
#include "cantera/ext/format.h"
namespace Cantera
{
@ -77,7 +78,21 @@ public:
* generated.
* @param msg Descriptive string describing the type of error message.
*/
CanteraError(const std::string& procedure, const std::string& msg);
template <typename... Args>
CanteraError(const std::string& procedure, const std::string& msg,
const Args&... args)
: procedure_(procedure)
, saved_(false)
{
if (sizeof...(args) == 0) {
msg_ = msg;
} else {
msg_ = fmt::format(msg, args...);
}
// Save the error in the global list of errors so that showError()
// can work
save();
}
//! Destructor for base class does nothing
virtual ~CanteraError() throw() {};

9
src/base/ctexceptions.cpp
View file

@ -11,15 +11,6 @@ namespace Cantera
static const char* stars = "***********************************************************************\n";
CanteraError::CanteraError(const std::string& procedure, const std::string& msg) :
procedure_(procedure),
msg_(msg),
saved_(false)
{
// Save the error in the global list of errors so that showError() can work
save();
}
CanteraError::CanteraError(const std::string& procedure) :
procedure_(procedure),
saved_(false)