From 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 Mon Sep 17 00:00:00 2001 From: Kane York Date: Sat, 1 Aug 2020 15:32:00 -0700 Subject: fix(3p/nix): revert "apply all clang-tidy fixes" 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 Tested-by: BuildkiteCI --- third_party/nix/src/libexpr/names.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/nix/src/libexpr/names.cc') diff --git a/third_party/nix/src/libexpr/names.cc b/third_party/nix/src/libexpr/names.cc index 84329d7c02c0..1e9c2f2f4aac 100644 --- a/third_party/nix/src/libexpr/names.cc +++ b/third_party/nix/src/libexpr/names.cc @@ -68,8 +68,8 @@ std::string nextComponent(std::string::const_iterator& p, } static bool componentsLT(const std::string& c1, const std::string& c2) { - int n1 = 0; - int n2 = 0; + int n1; + int n2; bool c1Num = absl::SimpleAtoi(c1, &n1); bool c2Num = absl::SimpleAtoi(c2, &n2); -- cgit 1.4.1