wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Merge branch 'error-format' of https://github.com/bburdette/nix

Browse source
This commit is contained in:
Eelco Dolstra 2020-04-22 15:29:10 +02:00
commit 16e3bf4537
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
9 changed files with 370 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libutil/types.hh
View file

@ -41,7 +41,8 @@ struct FormatOrString
{
string s;
FormatOrString(const string & s) : s(s) { };
FormatOrString(const format & f) : s(f.str()) { };
template<class F>
FormatOrString(const F & f) : s(f.str()) { };
FormatOrString(const char * s) : s(s) { };
};
@ -51,12 +52,13 @@ struct FormatOrString
... a_n’. However, ‘fmt(s)’ is equivalent to ‘s’ (so no %-expansion
takes place). */
inline void formatHelper(boost::format & f)
template<class F>
inline void formatHelper(F & f)
{
}
template<typename T, typename... Args>
inline void formatHelper(boost::format & f, const T & x, const Args & ... args)
template<class F, typename T, typename... Args>
inline void formatHelper(F & f, const T & x, const Args & ... args)
{
formatHelper(f % x, args...);
}