diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-08-04T17·48+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-08-04T17·48+0000 |
commit | 587dc8aa003cc5f676cc7d01b4fea984f5033107 (patch) | |
tree | 0b04f6705e122f54aa3c7bd25103b8eddebd6a58 /src/libexpr/primops.cc | |
parent | fd9c77dfc7b90d447e6bfdb4f0d5b521184aeddb (diff) | |
parent | 750be19ae865da3ee03c132a287148f2402ad72b (diff) |
* Sync with the trunk.
Diffstat (limited to 'src/libexpr/primops.cc')
-rw-r--r-- | src/libexpr/primops.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 42c8586116aa..68f66acc74ed 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -788,13 +788,13 @@ static void prim_intersectAttrs(EvalState & state, Value * * args, Value & v) state.forceAttrs(*args[1]); state.mkAttrs(v); - - foreach (Bindings::iterator, i, *args[1]->attrs) { - Bindings::iterator j = args[0]->attrs->find(i->first); - if (j != args[0]->attrs->end()) { - Attr & a = (*v.attrs)[i->first]; - mkCopy(a.value, i->second.value); - a.pos = i->second.pos; + + foreach (Bindings::iterator, i, *args[0]->attrs) { + Bindings::iterator j = args[1]->attrs->find(i->first); + if (j != args[1]->attrs->end()) { + Attr & a = (*v.attrs)[j->first]; + mkCopy(a.value, j->second.value); + a.pos = j->second.pos; } } } |