From cf63f689802da9c057277c5a7034aea5149ac55c Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Wed, 24 Apr 2019 02:01:10 -0700 Subject: [PATCH 1/2] BoxedLcpConstraintSolver: API compatible with 6.7 Fixes #1288 by adding default values to solver arguments. --- dart/constraint/BoxedLcpConstraintSolver.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dart/constraint/BoxedLcpConstraintSolver.hpp b/dart/constraint/BoxedLcpConstraintSolver.hpp index 55fd43d0b9b0a..a94b3b96ff689 100644 --- a/dart/constraint/BoxedLcpConstraintSolver.hpp +++ b/dart/constraint/BoxedLcpConstraintSolver.hpp @@ -58,8 +58,8 @@ class BoxedLcpConstraintSolver : public ConstraintSolver DART_DEPRECATED(6.8) BoxedLcpConstraintSolver( double timeStep, - BoxedLcpSolverPtr boxedLcpSolver, - BoxedLcpSolverPtr secondaryBoxedLcpSolver); + BoxedLcpSolverPtr boxedLcpSolver = nullptr, + BoxedLcpSolverPtr secondaryBoxedLcpSolver = nullptr); /// Constructos with default primary and secondary LCP solvers, which are /// Dantzig and PGS, respectively. From eade86cd1b6534bb81a032007760c762cd621dc8 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 24 Apr 2019 04:42:27 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77193eed9b56a..118405f78d6b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ #### Changes -* XXX +* Dynamics - * XXX: [#XXXX](https://github.com/dartsim/dart/pull/XXXX) + * Fixed BoxedLcpConstraintSolver is not API compatible with 6.7: [#1291](https://github.com/dartsim/dart/pull/1291) #### Compilers Tested