From 5af294d49edb013699863b48cc24f374de641389 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Tue, 6 Apr 2021 16:47:06 -0400 Subject: [PATCH] Update test_potential_file_reader.cpp --- .../formats/test_potential_file_reader.cpp | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/unittest/formats/test_potential_file_reader.cpp b/unittest/formats/test_potential_file_reader.cpp index 1e3d96d6d7..6331db28a7 100644 --- a/unittest/formats/test_potential_file_reader.cpp +++ b/unittest/formats/test_potential_file_reader.cpp @@ -42,18 +42,20 @@ using utils::split_words; // whether to print verbose output (i.e. not capturing LAMMPS screen output). bool verbose = false; -const int LAMMPS_NS::PairSW::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairComb::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairComb3::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairTersoff::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairTersoffMOD::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairTersoffMODC::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairTersoffZBL::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairGW::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairGWZBL::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairNb3bHarmonic::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairVashishta::NPARAMS_PER_LINE; -const int LAMMPS_NS::PairTersoffTable::NPARAMS_PER_LINE; +#if __cplusplus < 201703L +constexpr int LAMMPS_NS::PairSW::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairComb::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairComb3::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairTersoff::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairTersoffMOD::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairTersoffMODC::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairTersoffZBL::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairGW::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairGWZBL::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairNb3bHarmonic::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairVashishta::NPARAMS_PER_LINE; +constexpr int LAMMPS_NS::PairTersoffTable::NPARAMS_PER_LINE; +#endif class PotentialFileReaderTest : public LAMMPSTest { };