Merge branch 'master' into pygromacs

[alexxy/gromacs.git] / src / gromacs / gmxlib / typedefs.cpp

diff --git a/src/gromacs/gmxlib/typedefs.cpp b/src/gromacs/gmxlib/typedefs.cpp
index 000a30bd194d09d383fdc21297337bb38a6256be..6dd0e3bbe053c9e3c5d8f5cf10f751c7d2251f45 100644 (file)
--- a/src/gromacs/gmxlib/typedefs.cpp
+++ b/src/gromacs/gmxlib/typedefs.cpp
@@ -39,7 +39,7 @@
 
 #include "gromacs/legacyheaders/typedefs.h"
 
-#include <string.h>
+#include <cstring>
 
 #include <algorithm>
 
@@ -56,7 +56,7 @@ int gmx_int64_to_int(gmx_int64_t step, const char *warn)
 {
     int i;
 
-    i = (int)step;
+    i = static_cast<int>(step);
 
     if (warn != NULL && (step < INT_MIN || step > INT_MAX))
     {
@@ -71,7 +71,7 @@ int gmx_int64_to_int(gmx_int64_t step, const char *warn)
 
 void init_inputrec(t_inputrec *ir)
 {
-    memset(ir, 0, (size_t)sizeof(*ir));
+    std::memset(ir, 0, sizeof(*ir));
     snew(ir->fepvals, 1);
     snew(ir->expandedvals, 1);
     snew(ir->simtempvals, 1);