Fix build

[?]

Jul 30, 2015, 11:45 PM

HNGPGVBTFCEYF4YCAUTDGADAU7IXQBAAUNE6RIFUD3HXFGU5QPBAC

Dependencies

[2] IMQRX4MP hydra-eval-jobs: Use JSON instead of XML
[3] 5DYPEBSI hydra-eval-jobs: Use function argument default values
[4] DPYJFBXU hydra-eval-jobs: Support meta.license being a list
[5] HVXL2XUZ
[6] JTHWA6AM Rename aggregate members to constituents
[7] AEKIREIH * Updated hydra_eval_jobs for the new evaluator.
[8] FTPCV25M Store aggregate members in the database
[9] 7BRTFGVY Really fix hydra-eval-jobs
[10] 4LWGZL33
[11] WWEGP5ET * Use default values of job function arguments if they're not
[12] WJTP6VZI Fix building against the latest Nix
[13] AEFNBIIW * Merge the GC branch.
[14] HJYRK37A * Revert r27114, it seems to break stuff.
[15] YNGIYQRF hydra-eval-jobs: Don't keep track of used inputs
[16] 5X6FHW3S hydra-eval-jobs: Fix building against the latest unstable Nix
[17] FGUL3HAZ hydra-eval-jobs: Don't go into an infinite recursion
[*] 4N5APGRG * Start of a helper tool to evaluate job expressions efficiently.

Change contents

replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 58

[3.821]→[3.677:733](∅→∅)

foreach (ValueList::const_iterator, i, a->second) {

[3.821]

[3.89]

for (auto & i : a->second) {
replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 60

[3.185]→[3.185:258](∅→∅)

for (auto & i: actualArgs)
actualArgs2.push_back(i);

[3.185]

[3.979]

for (auto & j : actualArgs)
actualArgs2.push_back(j);
replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 63

[3.1017]→[3.734:786](∅→∅)

actualArgs2.push_back(Attr(cur->name, *i));

[3.1017]

[3.786]

actualArgs2.push_back(Attr(cur->name, i));
replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 79

[3.231]→[3.231:268](∅→∅)

else if (v->type == tList) {

[3.231]

[3.268]

else if (v->isList()) {
replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 81

[3.297]→[3.297:406](∅→∅)

for (unsigned int n = 0; n < v->list.length; ++n) {
Value v2(*v->list.elems[n]);

[3.297]

[3.406]

for (unsigned int n = 0; n < v->listSize(); ++n) {
Value v2(*v->listElems()[n]);
replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 140

[3.574]→[3.574:789](∅→∅)

foreach (PathSet::iterator, i, context)
if (i->at(0) == '!') {
size_t index = i->find("!", 1);
drvs.insert(string(*i, index + 1));

[3.574]

[3.789]

for (auto & i : context)
if (i.at(0) == '!') {
size_t index = i.find("!", 1);
drvs.insert(string(i, index + 1));
replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 167

[3.120]→[3.120:178](∅→∅),[3.178]→[2.1489:1551](∅→∅),[3.489]→[3.250:336](∅→∅),[2.1551]→[3.250:336](∅→∅),[3.250]→[3.250:336](∅→∅)

foreach (Bindings::iterator, i, *v.attrs)
findJobs(state, top, argsLeft, *i->value,
(attrPath.empty() ? "" : attrPath + ".") + (string) i->name);

[3.120]

[3.336]

for (auto & i : *v.attrs)
findJobs(state, top, argsLeft, *i.value,
(attrPath.empty() ? "" : attrPath + ".") + (string) i.name);