Fix part of old-style casting

[alexxy/gromacs.git] / src / gromacs / selection / sm_merge.cpp

diff --git a/src/gromacs/selection/sm_merge.cpp b/src/gromacs/selection/sm_merge.cpp
index 4066c5d931a08a04790f0000cd22b7afd546a927..26298901c1eca62048d78bb5d000afd1ef3a899f 100644 (file)
--- a/src/gromacs/selection/sm_merge.cpp
+++ b/src/gromacs/selection/sm_merge.cpp
@@ -200,7 +200,7 @@ init_data_merge(int npar, gmx_ana_selparam_t *param)
 static void
 init_merge(const gmx_mtop_t * /* top */, int /* npar */, gmx_ana_selparam_t * /* param */, void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
 
     if (d->stride < 0)
     {
@@ -227,7 +227,7 @@ init_merge(const gmx_mtop_t * /* top */, int /* npar */, gmx_ana_selparam_t * /*
 static void
 init_output_common(const gmx_mtop_t *top, gmx_ana_selvalue_t *out, void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
 
     GMX_UNUSED_VALUE(top);
     if (d->p1.m.type != d->p2.m.type)
@@ -253,7 +253,7 @@ init_output_common(const gmx_mtop_t *top, gmx_ana_selvalue_t *out, void *data)
 static void
 init_output_merge(const gmx_mtop_t *top, gmx_ana_selvalue_t *out, void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
     int                 i, j;
 
     init_output_common(top, out, data);
@@ -275,7 +275,7 @@ init_output_merge(const gmx_mtop_t *top, gmx_ana_selvalue_t *out, void *data)
 static void
 init_output_plus(const gmx_mtop_t *top, gmx_ana_selvalue_t *out, void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
     int                 i;
 
     init_output_common(top, out, data);
@@ -297,7 +297,7 @@ init_output_plus(const gmx_mtop_t *top, gmx_ana_selvalue_t *out, void *data)
 static void
 free_data_merge(void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
     delete d;
 }
 
@@ -305,7 +305,7 @@ static void
 evaluate_merge(const gmx::SelMethodEvalContext & /*context*/,
                gmx_ana_pos_t * /* p */, gmx_ana_selvalue_t *out, void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
     int                 i, j;
     int                 refid;
 
@@ -335,7 +335,7 @@ static void
 evaluate_plus(const gmx::SelMethodEvalContext & /*context*/,
               gmx_ana_pos_t * /* p */, gmx_ana_selvalue_t *out, void *data)
 {
-    t_methoddata_merge *d = (t_methoddata_merge *)data;
+    t_methoddata_merge *d = static_cast<t_methoddata_merge *>(data);
     int                 i;
     int                 refid;