Tidy: modernize-use-nullptr

[alexxy/gromacs.git] / src / gromacs / fileio / oenv.cpp

diff --git a/src/gromacs/fileio/oenv.cpp b/src/gromacs/fileio/oenv.cpp
index fcc648f576e473fb624dd50881ce0091155b2cca..4c1f5fbf259eaadaf9e6705eb36571a62455a716 100644 (file)
--- a/src/gromacs/fileio/oenv.cpp
+++ b/src/gromacs/fileio/oenv.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2013,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.
@@ -77,12 +77,12 @@ struct gmx_output_env_t
 static const real  timefactors[] =   { real(0),  real(1e3),  real(1), real(1e-3), real(1e-6), real(1e-9), real(1e-12), real(0) };
 static const real  timeinvfactors[] = { real(0), real(1e-3),  real(1),  real(1e3),  real(1e6),  real(1e9),  real(1e12), real(0) };
 static const char *time_units_str[] = {
-    NULL, "fs", "ps", "ns", "us",
+    nullptr, "fs", "ps", "ns", "us",
     "\\mus", "ms", "s"
 };
 static const char *time_units_xvgr[] = {
-    NULL, "fs", "ps", "ns",
-    "ms", "s", NULL
+    nullptr, "fs", "ps", "ns",
+    "ms", "s", nullptr
 };
 
 
@@ -194,7 +194,7 @@ xvg_format_t output_env_get_xvg_format(const gmx_output_env_t *oenv)
 
 const char *output_env_get_program_display_name(const gmx_output_env_t *oenv)
 {
-    const char *displayName = NULL;
+    const char *displayName = nullptr;
 
     try
     {