Tidy: modernize-use-nullptr

[alexxy/gromacs.git] / src / gromacs / listed-forces / pairs.cpp

diff --git a/src/gromacs/listed-forces/pairs.cpp b/src/gromacs/listed-forces/pairs.cpp
index 8a930ccd6a96606c35ff4f7852101d98d370cef7..3f32f7446340e4a59caa531d6f0bf95b2dec39a1 100644 (file)
--- a/src/gromacs/listed-forces/pairs.cpp
+++ b/src/gromacs/listed-forces/pairs.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -374,8 +374,8 @@ do_pairs_general(int ftype, int nbonds,
             energygrp_vdw  = grppener->ener[egLJSR];
             break;
         default:
-            energygrp_elec = NULL; /* Keep compiler happy */
-            energygrp_vdw  = NULL; /* Keep compiler happy */
+            energygrp_elec = nullptr; /* Keep compiler happy */
+            energygrp_vdw  = nullptr; /* Keep compiler happy */
             gmx_fatal(FARGS, "Unknown function type %d in do_nonbonded14", ftype);
             break;
     }
@@ -668,13 +668,13 @@ do_pairs(int ftype, int nbonds,
         t_pbc        pbc_no;
         const t_pbc *pbc_nonnull;
 
-        if (pbc != NULL)
+        if (pbc != nullptr)
         {
             pbc_nonnull   = pbc;
         }
         else
         {
-            set_pbc(&pbc_no, epbcNONE, NULL);
+            set_pbc(&pbc_no, epbcNONE, nullptr);
             pbc_nonnull   = &pbc_no;
         }