Merge branch release-2016

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

diff --git a/src/gromacs/mdrunutility/handlerestart.cpp b/src/gromacs/mdrunutility/handlerestart.cpp
index 529b47be37d4b99e9e3546272d9f0ffa2cb83df0..36545f9c1373bb932ce35d550dafbb02a052f2b1 100644 (file)
--- a/src/gromacs/mdrunutility/handlerestart.cpp
+++ b/src/gromacs/mdrunutility/handlerestart.cpp
@@ -207,8 +207,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);
@@ -272,7 +272,7 @@ handleRestart(t_commrec *cr,
             }
             else
             {
-                fpmulti = NULL;
+                fpmulti = nullptr;
             }
             check_multi_int(fpmulti, cr->ms, sim_part, "simulation part", TRUE);
         }