From 15afa8472e1b1bbf236d4cf8e9f399345c48d3fe Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 19 Jul 2020 21:52:35 +0100 Subject: fix(3p/nix): Fix all remaining compiler warnings This compiles under `-Wall -Werror`. The largest chunk of this change is `final` qualifiers for the various Nix CLI command structs, which inherit from a Command class that has more virtual functions than are implemented by each command. Change-Id: I0925e6e1a39013f026773db5816e4a77d50f3b4a Reviewed-on: https://cl.tvl.fyi/c/depot/+/1294 Tested-by: BuildkiteCI Reviewed-by: isomer Reviewed-by: kanepyork --- third_party/nix/src/libutil/util.hh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'third_party/nix/src/libutil') diff --git a/third_party/nix/src/libutil/util.hh b/third_party/nix/src/libutil/util.hh index c39a6f06a5cf..ede83164de2e 100644 --- a/third_party/nix/src/libutil/util.hh +++ b/third_party/nix/src/libutil/util.hh @@ -390,6 +390,11 @@ class Callback { } } +// The unused-variable assert is disabled in this block because the +// `prev` variables are only used in debug mode (in the asserts). +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-variable" + void operator()(T&& t) noexcept { auto prev = done.test_and_set(); assert(!prev); @@ -406,6 +411,8 @@ class Callback { promise.set_exception(exc); fun(promise.get_future()); } + +#pragma clang diagnostic pop }; /* Start a thread that handles various signals. Also block those signals -- cgit 1.4.1