diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
| commit | eefcd6d0b271642d470cd55bc47d1579d943938e (patch) | |
| tree | 48f9e4db455879025adb9317b740bfa4b72c2d66 /src/context.cc | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'src/context.cc')
| -rw-r--r-- | src/context.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/context.cc b/src/context.cc index a2a8d13..97ea5b9 100644 --- a/src/context.cc +++ b/src/context.cc @@ -51,9 +51,8 @@ Context::Context(const Context *parent, const Module *library) this->functions_p = &library->functions; this->modules_p = &library->modules; this->usedlibs_p = &library->usedlibs; - for (size_t j = 0; j < library->assignments_var.size(); j++) { - this->set_variable(library->assignments_var[j], - library->assignments_expr[j]->evaluate(this)); + BOOST_FOREACH(const std::string &var, library->assignments_var) { + this->set_variable(var, library->assignments.at(var)->evaluate(this)); } } else { |