diff options
| author | Ben Burdette <bburdette@protonmail.com> | 2022-04-07 13:42:01 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@protonmail.com> | 2022-04-07 13:42:01 -0600 |
| commit | 1a93ac8133381eb692416c4e46b1706faa5cd89f (patch) | |
| tree | 9a559f977ad6213c055099f6f2ab6be96f0c551b /src/libstore/build/worker.hh | |
| parent | d2ec9b4e15718e42720787140d7825dcbfd73249 (diff) | |
| parent | 8b1e328d5d0ae7d3a4a8f6012ec065b59674ed4a (diff) | |
Merge remote-tracking branch 'upstream/master' into upstream-merge
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 |