Merge branch release-2016 into release-2018

[alexxy/gromacs.git] / src / gromacs / mdrunutility / handlerestart.cpp

diff --git a/src/gromacs/mdrunutility/handlerestart.cpp b/src/gromacs/mdrunutility/handlerestart.cpp
index dcef11f8dc6424fee44dd260220e7efabe0750db..6ef0c7256981dd43ebf39b5c7339165a34adffc1 100644 (file)
--- a/src/gromacs/mdrunutility/handlerestart.cpp
+++ b/src/gromacs/mdrunutility/handlerestart.cpp
@@ -105,7 +105,7 @@ read_checkpoint_data(const char *filename, int *simulation_part,
                      int nfile, const t_filenm fnm[],
                      const char *part_suffix,
                      gmx_bool *bAddPart,
-                     gmx_bool *bDoAppendFiles)
+                     bool *bDoAppendFiles)
 {
     t_fileio            *fp;
     int                  nfiles;
@@ -209,8 +209,8 @@ read_checkpoint_data(const char *filename, int *simulation_part,
                  */
                 strcpy(suf_up, part_suffix);
                 upstring(suf_up);
-                *bAddPart = (strstr(fn, part_suffix) != NULL ||
-                             strstr(fn, suf_up) != NULL);
+                *bAddPart = (strstr(fn, part_suffix) != nullptr ||
+                             strstr(fn, suf_up) != nullptr);
             }
 
             sfree(outputfiles);
@@ -235,8 +235,8 @@ handleRestart(t_commrec *cr,
               gmx_bool   bTryToAppendFiles,
               const int  NFILE,
               t_filenm   fnm[],
-              gmx_bool  *bDoAppendFiles,
-              gmx_bool  *bStartFromCpt)
+              bool      *bDoAppendFiles,
+              bool      *bStartFromCpt)
 {
     gmx_bool        bAddPart;
     int             sim_part, sim_part_fn;
@@ -274,7 +274,7 @@ handleRestart(t_commrec *cr,
             }
             else
             {
-                fpmulti = NULL;
+                fpmulti = nullptr;
             }
             check_multi_int(fpmulti, cr->ms, sim_part, "simulation part", TRUE);
         }