wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 23:13:14 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-05 20:53:32 +01:00
commit ab88f4bbd4
6 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/logging.hh
View file

@ -158,10 +158,10 @@ extern Verbosity verbosity; /* suppress msgs > this */
#define vomit(args...) printMsg(lvlVomit, args)
template<typename... Args>
inline void warn(const std::string & fs, Args... args)
inline void warn(const std::string & fs, const Args & ... args)
{
boost::format f(fs);
nop{boost::io::detail::feed(f, args)...};
formatHelper(f, args...);
logger->warn(f.str());
}

20
src/libutil/types.hh
View file

@ -51,6 +51,16 @@ struct FormatOrString
... a_n’. However, ‘fmt(s)’ is equivalent to ‘s’ (so no %-expansion
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)
{
return s;
@ -67,11 +77,11 @@ inline std::string fmt(const FormatOrString & fs)
}
template<typename... Args>
inline std::string fmt(const std::string & fs, Args... args)
inline std::string fmt(const std::string & fs, const Args & ... args)
{
boost::format f(fs);
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();
}
@ -87,14 +97,14 @@ public:
unsigned int status = 1; // exit status
template<typename... Args>
BaseError(unsigned int status, Args... args)
BaseError(unsigned int status, const Args & ... args)
: err(fmt(args...))
, status(status)
{
}
template<typename... Args>
BaseError(Args... args)
BaseError(const Args & ... args)
: err(fmt(args...))
{
}
@ -126,7 +136,7 @@ public:
int errNo;
template<typename... Args>
SysError(Args... args)
SysError(const Args & ... args)
: Error(addErrno(fmt(args...)))
{ }

2
src/libutil/util.hh
View file

@ -305,7 +305,7 @@ public:
int status;
template<typename... Args>
ExecError(int status, Args... args)
ExecError(int status, const Args & ... args)
: Error(args...), status(status)
{ }
};