Merge branch 'master' into pygromacs

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

diff --git a/src/gromacs/gmxlib/sighandler.cpp b/src/gromacs/gmxlib/sighandler.cpp
index d22fe2159be12204fbf0d8944ec4e391c3b8c857..58943ee1328ddee04a50e93599ee36d50a9ae24c 100644 (file)
--- a/src/gromacs/gmxlib/sighandler.cpp
+++ b/src/gromacs/gmxlib/sighandler.cpp
@@ -40,7 +40,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/fatalerror.h"
@@ -182,7 +182,7 @@ const char *gmx_get_signal_name(void)
 gmx_bool gmx_got_usr_signal(void)
 {
 #if HAVE_SIGUSR1
-    gmx_bool ret = (gmx_bool)usr_condition;
+    gmx_bool ret = static_cast<gmx_bool>(usr_condition);
     usr_condition = 0;
     return ret;
 #else