diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-04T14·04+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-04T14·16+0200 |
commit | 6c75cf69c34af676b6b39ff69fcb439e7a4bda6e (patch) | |
tree | c66abd02ca1a5b5b9dedcc8d2477696f7414af23 /src/libstore/build.cc | |
parent | 0d4a10e910e1916a6f36cb9af6b68817172b51a9 (diff) |
Cleanup: Remove singleton()
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index e6ec7886f3cd..81c79435ef8b 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2145,8 +2145,7 @@ void DerivationGoal::startBuilder() /* parent */ pid.setSeparatePG(true); builderOut.writeSide.close(); - worker.childStarted(shared_from_this(), - singleton<set<int> >(builderOut.readSide), true, true); + worker.childStarted(shared_from_this(), {builderOut.readSide}, true, true); /* Check if setting up the build environment failed. */ while (true) { @@ -3698,7 +3697,7 @@ void LocalStore::ensurePath(const Path & path) Worker worker(*this); GoalPtr goal = worker.makeSubstitutionGoal(path); - Goals goals = singleton<Goals>(goal); + Goals goals = {goal}; worker.run(goals); @@ -3711,7 +3710,7 @@ void LocalStore::repairPath(const Path & path) { Worker worker(*this); GoalPtr goal = worker.makeSubstitutionGoal(path, true); - Goals goals = singleton<Goals>(goal); + Goals goals = {goal}; worker.run(goals); |