diff options
| author | Kane York <kanepyork@gmail.com> | 2020-08-01T22·32-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-08-01T22·45+0000 |
| commit | 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 (patch) | |
| tree | eacd58ae5e0de9ffaadc265b8fd417f2f62d0433 /third_party/nix/src/libstore/legacy-ssh-store.cc | |
| parent | cc3c45f739133162c840d500c0d633f46a524e06 (diff) | |
fix(3p/nix): revert "apply all clang-tidy fixes" r/1534
This reverts commit ef54f5da9fa30b5c302f2a49595ee5d041f9706a. Resolved conflicts: third_party/nix/src/libexpr/eval.cc third_party/nix/src/libstore/builtins/fetchurl.cc third_party/nix/src/libstore/references.cc third_party/nix/src/libutil/hash.cc third_party/nix/src/nix-daemon/nix-daemon.cc Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nix/src/libstore/legacy-ssh-store.cc')
| -rw-r--r-- | third_party/nix/src/libstore/legacy-ssh-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/libstore/legacy-ssh-store.cc b/third_party/nix/src/libstore/legacy-ssh-store.cc index 8ae40d0da9..02231aabcd 100644 --- a/third_party/nix/src/libstore/legacy-ssh-store.cc +++ b/third_party/nix/src/libstore/legacy-ssh-store.cc @@ -34,7 +34,7 @@ struct LegacySSHStore : public Store { std::unique_ptr<SSHMaster::Connection> sshConn; FdSink to; FdSource from; - int remoteVersion{}; + int remoteVersion; bool good = true; }; @@ -214,7 +214,7 @@ struct LegacySSHStore : public Store { conn->to.flush(); BuildResult status; - status.status = static_cast<BuildResult::Status>(readInt(conn->from)); + status.status = (BuildResult::Status)readInt(conn->from); conn->from >> status.errorMsg; if (GET_PROTOCOL_MINOR(conn->remoteVersion) >= 3) { |