Merge branch 'release-2019' into master

[alexxy/gromacs.git] / src / gromacs / mdlib / constr.cpp

diff --git a/src/gromacs/mdlib/constr.cpp b/src/gromacs/mdlib/constr.cpp
index 48a26c647a60e4990678ab9dd84d2e34b0c7dcf1..e75f429e782970b325c02bd160075f5c89dcc2a7 100644 (file)
--- a/src/gromacs/mdlib/constr.cpp
+++ b/src/gromacs/mdlib/constr.cpp
@@ -728,7 +728,7 @@ ArrayRef<real> Constraints::rmsdData() const
     }
     else
     {
-        return EmptyArrayRef();
+        return {};
     }
 }
 
@@ -1139,6 +1139,22 @@ Constraints::Impl::Impl(const gmx_mtop_t     &mtop_p,
 
 Constraints::Impl::~Impl()
 {
+    for (auto blocka : at2con_mt)
+    {
+        done_blocka(&blocka);
+    }
+    if (bSettleErrorHasOccurred != nullptr)
+    {
+        sfree(bSettleErrorHasOccurred);
+    }
+    if (vir_r_m_dr_th != nullptr)
+    {
+        sfree(vir_r_m_dr_th);
+    }
+    if (settled != nullptr)
+    {
+        settle_free(settled);
+    }
     done_lincs(lincsd);
 }