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

Make fmt() non-recursive

Browse source
This commit is contained in:
Eelco Dolstra 2017-05-11 17:06:07 +02:00
parent 0124d118ef
commit 2b761d5f50
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/logging.hh
View file

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

17
src/libutil/types.hh
View file

@ -32,6 +32,11 @@ using std::vector;
using boost::format; using boost::format;
/* A variadic template that does nothing. Useful to call a function
for all variadic arguments but ignoring the result. */
struct nop { template<typename... T> nop(T...) {} };
struct FormatOrString struct FormatOrString
{ {
string s; string s;
@ -46,16 +51,6 @@ 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, T x, 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;
@ -75,7 +70,7 @@ template<typename... Args>
inline std::string fmt(const std::string & fs, Args... args) inline std::string fmt(const std::string & fs, Args... args)
{ {
boost::format f(fs); boost::format f(fs);
formatHelper(f, args...); nop{boost::io::detail::feed(f, args)...};
return f.str(); return f.str();
} }