about summary refs log tree commit diff
path: root/third_party/nix/src/libutil/util.hh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-07-19T20·52+0100
committertazjin <mail@tazj.in>2020-07-19T22·00+0000
commit15afa8472e1b1bbf236d4cf8e9f399345c48d3fe (patch)
tree88e475abad625ea4fed00525ab7d2ff882238a59 /third_party/nix/src/libutil/util.hh
parentca50fb66d26a589dbc2935de68d95716b595a07a (diff)
fix(3p/nix): Fix all remaining compiler warnings r/1403
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 <isomer@tvl.fyi>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party/nix/src/libutil/util.hh')
-rw-r--r--third_party/nix/src/libutil/util.hh7
1 files changed, 7 insertions, 0 deletions
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