diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-05-04 11:58:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 11:58:20 +0200 |
| commit | 470e27ce8008ba952225b9f9f7f61a9627376f33 (patch) | |
| tree | 26f93c989175825996538b6e8aae4af5ed28bfa0 /src/libstore | |
| parent | 1385b2007804c8a0370f2a6555045a00e34b07c7 (diff) | |
| parent | 107613ad2b2b61ef92edf9ee53ec71ad664be71b (diff) | |
Merge pull request #6482 from edolstra/json-utils
Move json stuff out of util.cc
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/build/local-derivation-goal.cc | 3 | ||||
| -rw-r--r-- | src/libstore/build/worker.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index 7f44276bd..3ac9c20f9 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -14,6 +14,7 @@ #include "worker-protocol.hh" #include "topo-sort.hh" #include "callback.hh" +#include "json-utils.hh" #include <regex> #include <queue> @@ -56,8 +57,6 @@ #include <pwd.h> #include <grp.h> -#include <nlohmann/json.hpp> - namespace nix { void handleDiffHook( diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index e7c01a737..b192fbc77 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -350,7 +350,7 @@ void Worker::waitForInput() become `available'. Note that `available' (i.e., non-blocking) includes EOF. */ std::vector<struct pollfd> pollStatus; - std::map <int, int> fdToPollStatus; + std::map<int, size_t> fdToPollStatus; for (auto & i : children) { for (auto & j : i.fds) { pollStatus.push_back((struct pollfd) { .fd = j, .events = POLLIN }); |