diff options
author | regnat <rg@regnat.ovh> | 2020-12-01 14:57:56 +0100 |
---|---|---|
committer | regnat <rg@regnat.ovh> | 2020-12-01 15:04:03 +0100 |
commit | 438977731cf049cf47873d5825456d47a1aac541 (patch) | |
tree | 3636db99c851ff572d5dad6f656a5ec195dc7489 /src/nix | |
parent | 88798613ee288c7a801dcc1e73723a10a385df38 (diff) |
shut up clang warnings
- Fix some class/struct discrepancies
- Explicit the overloading of `run` in the `Cmd*` classes
- Ignore a warning in the generated lexer
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/run.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nix/run.cc b/src/nix/run.cc index 790784382..92a52c6cd 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -22,6 +22,9 @@ std::string chrootHelperName = "__run_in_chroot"; struct RunCommon : virtual Command { + + using Command::run; + void runProgram(ref<Store> store, const std::string & program, const Strings & args) @@ -59,6 +62,9 @@ struct RunCommon : virtual Command struct CmdShell : InstallablesCommand, RunCommon, MixEnvironment { + + using InstallablesCommand::run; + std::vector<std::string> command = { getEnv("SHELL").value_or("bash") }; CmdShell() @@ -144,6 +150,8 @@ static auto rCmdShell = registerCommand<CmdShell>("shell"); struct CmdRun : InstallableCommand, RunCommon { + using InstallableCommand::run; + std::vector<std::string> args; CmdRun() |