nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-13 14:02:42 +01:00
Code Activity

Merge remote-tracking branch 'detsys/detsys-main' into logger-improvements

Browse source
This commit is contained in:
Eelco Dolstra 2025-03-26 23:21:32 +01:00
commit c8692b378b
206 changed files with 4776 additions and 2018 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/tee-logger.cc
View file

@ -4,9 +4,9 @@ namespace nix {
struct TeeLogger : Logger
{
std::vector<Logger *> loggers;
std::vector<std::unique_ptr<Logger>> loggers;
TeeLogger(std::vector<Logger *> loggers)
TeeLogger(std::vector<std::unique_ptr<Logger>> && loggers)
: loggers(std::move(loggers))
{
}
@ -100,9 +100,9 @@ struct TeeLogger : Logger
}
};
Logger * makeTeeLogger(std::vector<Logger *> loggers)
std::unique_ptr<Logger> makeTeeLogger(std::vector<std::unique_ptr<Logger>> && loggers)
{
return new TeeLogger(std::move(loggers));
return std::make_unique<TeeLogger>(std::move(loggers));
}
}