diff options
| author | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-30 20:56:38 +1100 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-30 20:56:38 +1100 |
| commit | 6a4786bde976e9a023c7f65a395384d214c5102c (patch) | |
| tree | f3dd303f21dfa0be269a932dd05438041a290f27 /impl/EquationSystem.hpp | |
| parent | ff2030f3a19926334fbe3a043c5f88622c17c2f8 (diff) | |
| parent | 95b82ea3830c3a34455323167894647e3aa773a6 (diff) | |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
impl/test/run
Diffstat (limited to 'impl/EquationSystem.hpp')
| -rw-r--r-- | impl/EquationSystem.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/impl/EquationSystem.hpp b/impl/EquationSystem.hpp index a0ba8a1..3342cc7 100644 --- a/impl/EquationSystem.hpp +++ b/impl/EquationSystem.hpp @@ -31,7 +31,7 @@ struct EquationSystem { delete _expr_to_var; } - MaxExpression<Domain>& maxExpression(const std::vector<Expression<Domain>*> arguments) { + MaxExpression<Domain>& maxExpression(const std::vector<Expression<Domain>*>& arguments) { unsigned int id = _max_expressions.size(); Maximum<Domain>* max = new Maximum<Domain>(); MaxExpression<Domain>* expr = new MaxExpression<Domain>(id, *max, arguments); @@ -105,7 +105,7 @@ struct EquationSystem { } } - virtual bool equalAssignments(const VariableAssignment<Domain>& l, const VariableAssignment<Domain>& r) const { + virtual bool equalAssignments(VariableAssignment<Domain>& l, VariableAssignment<Domain>& r) const { for (unsigned int i = 0, length = _variables.size(); i < length; ++i) { |