Merge branch release-2016

[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 670eb6b0eb74ae570b7380dd501ac726a9cd36f3..d72582984028bc5aba19913336c80eee541da44c 100644 (file)
--- a/src/gromacs/listed-forces/pairs.cpp
+++ b/src/gromacs/listed-forces/pairs.cpp
@@ -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;
         }