Merge branch 'origin/release-2020' into master

[alexxy/gromacs.git] / src / gromacs / nbnxm / pairlist.h

diff --git a/src/gromacs/nbnxm/pairlist.h b/src/gromacs/nbnxm/pairlist.h
index 97805f7f1b5a615ab051922d41a9851858b35d16..04f33159905bdc48ef3400306e01ba907f826352 100644 (file)
--- a/src/gromacs/nbnxm/pairlist.h
+++ b/src/gromacs/nbnxm/pairlist.h
@@ -208,6 +208,7 @@ typedef struct
 struct nbnxn_excl_t
 {
     //! Constructor, sets no exclusions, so all atom pairs interacting
+    MSVC_DIAGNOSTIC_IGNORE(26495) // pair is not being initialized!
     nbnxn_excl_t()
     {
         for (unsigned int& pairEntry : pair)
@@ -215,6 +216,7 @@ struct nbnxn_excl_t
             pairEntry = NBNXN_INTERACTION_MASK_ALL;
         }
     }
+    MSVC_DIAGNOSTIC_RESET
 
     //! Topology exclusion interaction bits per warp
     unsigned int pair[c_nbnxnGpuExclSize];