diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-10 17:03:16 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-10 17:10:15 +0000 |
| commit | e5c42bba9bf76d00fb15ec9a179bf91aa81c38c6 (patch) | |
| tree | 7597549f36313859d15cb4ae80c04af955c9a223 /src/libstore/build/worker.hh | |
| parent | 1ef88da3503b88f289a15786dfd48821cf5b6502 (diff) | |
| parent | 4d98143914120d0163f5c50f30ce8a5289433f8f (diff) | |
Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputs
Diffstat (limited to 'src/libstore/build/worker.hh')
| -rw-r--r-- | src/libstore/build/worker.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index 6a3b99c02..a1e036a96 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -38,7 +38,7 @@ struct Child { WeakGoalPtr goal; Goal * goal2; // ugly hackery - set<int> fds; + std::set<int> fds; bool respectTimeouts; bool inBuildSlot; steady_time_point lastOutput; /* time we last got output on stdout/stderr */ @@ -167,7 +167,7 @@ public: /* Registers a running child process. `inBuildSlot' means that the process counts towards the jobs limit. */ - void childStarted(GoalPtr goal, const set<int> & fds, + void childStarted(GoalPtr goal, const std::set<int> & fds, bool inBuildSlot, bool respectTimeouts); /* Unregisters a running child process. `wakeSleepers' should be |