From 81cb8a07ba3cb4d6aa5a49fbda490aa991c45dad Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Sun, 26 Apr 2020 00:58:56 -0700 Subject: [PATCH] Fix MSVC 2019 test failures Related #3495 --- src/gromacs/listed_forces/bonded.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gromacs/listed_forces/bonded.cpp b/src/gromacs/listed_forces/bonded.cpp index 792542b87e..4f90a31585 100644 --- a/src/gromacs/listed_forces/bonded.cpp +++ b/src/gromacs/listed_forces/bonded.cpp @@ -3972,7 +3972,7 @@ struct BondedInteractions * * This must have as many entries as interaction_function in ifunc.cpp */ template -const std::array c_bondedInteractionFunctions = { +constexpr std::array c_bondedInteractionFunctions = { BondedInteractions{ bonds, eNR_BONDS }, // F_BONDS BondedInteractions{ g96bonds, eNR_BONDS }, // F_G96BONDS BondedInteractions{ morse_bonds, eNR_MORSE }, // F_MORSE @@ -4068,7 +4068,7 @@ const std::array c_bondedInteractionFunctions = { }; /*! \brief List of instantiated BondedInteractions list */ -const gmx::EnumerationArray> c_bondedInteractionFunctionsPerFlavor = { +constexpr gmx::EnumerationArray> c_bondedInteractionFunctionsPerFlavor = { c_bondedInteractionFunctions, c_bondedInteractionFunctions, c_bondedInteractionFunctions, -- 2.22.0