chaostheorie/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Revert "Make fmt() non-recursive"

Browse source 
This reverts commit 2b761d5f50.

Also *really* make fmt() take arguments by reference.
This commit is contained in:
Eelco Dolstra 2019-12-05 17:48:16 +01:00
parent 334b8f8af1
commit 603b2f583c
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/logging.hh
View file

@ -161,7 +161,7 @@ template<typename... Args>
inline void warn(const std::string & fs, const Args & ... args) inline void warn(const std::string & fs, const Args & ... args)
{ {
boost::format f(fs); boost::format f(fs);
nop{boost::io::detail::feed(f, args)...}; formatHelper(f, args...);
logger->warn(f.str()); logger->warn(f.str());
} }

12
src/libutil/types.hh
View file

@ -51,6 +51,16 @@ struct FormatOrString
... a_n’. However, ‘fmt(s)’ is equivalent to ‘s’ (so no %-expansion ... a_n’. However, ‘fmt(s)’ is equivalent to ‘s’ (so no %-expansion
takes place). */ takes place). */
inline void formatHelper(boost::format & f)
{
}
template<typename T, typename... Args>
inline void formatHelper(boost::format & f, const T & x, const Args & ... args)
{
formatHelper(f % x, args...);
}
inline std::string fmt(const std::string & s) inline std::string fmt(const std::string & s)
{ {
return s; return s;
@ -71,7 +81,7 @@ inline std::string fmt(const std::string & fs, const Args & ... args)
{ {
boost::format f(fs); boost::format f(fs);
f.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit); f.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit);
nop{boost::io::detail::feed(f, args)...}; formatHelper(f, args...);
return f.str(); return f.str();
} }