From d331d3a0b5c497a46e2636f308234be66566c04c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 20 May 2020 04:33:07 +0100 Subject: refactor(3p/nix): Apply clang-tidy's modernize-* fixes This applies the modernization fixes listed here: https://clang.llvm.org/extra/clang-tidy/checks/list.html The 'modernize-use-trailing-return-type' fix was excluded due to my personal preference (more specifically, I think the 'auto' keyword is misleading in that position). --- third_party/nix/src/libstore/ssh-store.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/nix/src/libstore/ssh-store.cc') diff --git a/third_party/nix/src/libstore/ssh-store.cc b/third_party/nix/src/libstore/ssh-store.cc index 7728e00ec8..9c49babcf2 100644 --- a/third_party/nix/src/libstore/ssh-store.cc +++ b/third_party/nix/src/libstore/ssh-store.cc @@ -27,7 +27,7 @@ class SSHStore : public RemoteStore { std::string getUri() override { return uriScheme + host; } - bool sameMachine() { return false; } + bool sameMachine() override { return false; } void narFromPath(const Path& path, Sink& sink) override; @@ -78,7 +78,7 @@ static RegisterStoreImplementation regStore([](const std::string& uri, const Store::Params& params) -> std::shared_ptr { if (std::string(uri, 0, uriScheme.size()) != uriScheme) { - return 0; + return nullptr; } return std::make_shared(std::string(uri, uriScheme.size()), params); }); -- cgit 1.4.1