From 98299da0fda612b42ab933c47f18163cfef5fa71 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 25 May 2020 01:19:02 +0100 Subject: refactor(3p/nix/libutil): Replace string2Int & trim functions Replaces these functions with corresponding functions from Abseil, namely absl::StripAsciiWhitespace and absl::SimpleAtoi. In the course of doing this some minor things I encountered along the way were also refactored. This also changes the signatures of the various custom readFile functions to use absl::string_view types. --- third_party/nix/src/libmain/shared.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'third_party/nix/src/libmain') diff --git a/third_party/nix/src/libmain/shared.hh b/third_party/nix/src/libmain/shared.hh index edd0a5159a9d..60d7918931d7 100644 --- a/third_party/nix/src/libmain/shared.hh +++ b/third_party/nix/src/libmain/shared.hh @@ -2,6 +2,7 @@ #include +#include #include #include "args.hh" @@ -78,7 +79,7 @@ N getIntArg(const std::string& opt, Strings::iterator& i, } } N n; - if (!string2Int(s, n)) + if (!absl::SimpleAtoi(s, &n)) throw UsageError(format("'%1%' requires an integer argument") % opt); return n * multiplier; } -- cgit 1.4.1