diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28T21·51+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28T21·51+0100 |
commit | 8d6418d46e5f8a2f31417ba363efd2785c49b2eb (patch) | |
tree | 2712e3fd72d2b62f2297d17e9358165a3c1fe9e7 | |
parent | dec2f195022bcc14f217aa20c1e05e4b7fe9e917 (diff) |
Fix building without a garbage collector
http://hydra.nixos.org/build/6695350
-rw-r--r-- | src/libexpr/primops.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 6e1f86c2a09d..180a24dffc91 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -177,9 +177,9 @@ struct CompareValues #if HAVE_BOEHMGC -typedef list<Value *, gc_allocator<Value *> > ValueVector; +typedef list<Value *, gc_allocator<Value *> > ValueList; #else -typedef vector<Value *> ValueVector; +typedef list<Value *> ValueList; #endif @@ -196,7 +196,7 @@ static void prim_genericClosure(EvalState & state, Value * * args, Value & v) throw EvalError("attribute `startSet' required"); state.forceList(*startSet->value); - ValueVector workSet; + ValueList workSet; for (unsigned int n = 0; n < startSet->value->list.length; ++n) workSet.push_back(startSet->value->list.elems[n]); @@ -210,7 +210,7 @@ static void prim_genericClosure(EvalState & state, Value * * args, Value & v) /* Construct the closure by applying the operator to element of `workSet', adding the result to `workSet', continuing until no new elements are found. */ - ValueVector res; + ValueList res; // `doneKeys' doesn't need to be a GC root, because its values are // reachable from res. set<Value *, CompareValues> doneKeys; @@ -245,7 +245,7 @@ static void prim_genericClosure(EvalState & state, Value * * args, Value & v) /* Create the result list. */ state.mkList(v, res.size()); unsigned int n = 0; - foreach (ValueVector::iterator, i, res) + foreach (ValueList::iterator, i, res) v.list.elems[n++] = *i; } |