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

Allow writelog to do string formatting

Browse source 
If multiple arguments are supplied, the string is treated as a Python-style
format string and the extra arguments are used to populate the format string.
This commit is contained in:
Ray Speth 2015-09-07 00:47:37 -04:00
parent 41527b1ea7
commit 59b14724ed
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/cantera/base/global.h
View file

@ -144,13 +144,26 @@ std::string canteraRoot();
*/ */
//! @copydoc Application::Messages::writelog(const std::string&) //! @copydoc Application::Messages::writelog(const std::string&)
void writelog(const std::string& msg); void writelog_direct(const std::string& msg);
//! Write a message to the log only if loglevel > 0 //! Write a message to the log only if loglevel > 0
inline void debuglog(const std::string& msg, int loglevel) inline void debuglog(const std::string& msg, int loglevel)
{ {
if (loglevel > 0) { if (loglevel > 0) {
writelog(msg); writelog_direct(msg);
}
}
//! @copydoc Application::Messages::writelog(const std::string&)
//! This function passes its arguments to the cppformat 'format' function to
//! generate a formatted string from a Python-style (curly braces) format
//! string.
template <typename... Args>
void writelog(const std::string& fmt, const Args&... args) {
if (sizeof...(args) == 0) {
writelog_direct(fmt);
} else {
writelog_direct(fmt::format(fmt, args...));
} }
} }
@ -167,7 +180,7 @@ inline void debuglog(const std::string& msg, int loglevel)
*/ */
template <typename... Args> template <typename... Args>
void writelogf(const char* fmt, const Args& ... args) { void writelogf(const char* fmt, const Args& ... args) {
writelog(fmt::sprintf(fmt, args...)); writelog_direct(fmt::sprintf(fmt, args...));
} }
//! Write an end of line character to the screen and flush output //! Write an end of line character to the screen and flush output