From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Thu, 22 Apr 2021 12:56:31 +0000 (+0000)
Subject: Fix MSVC build
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=8aeaf8c1d2cb5844ec4dadbe480822eece5976a6;p=alexxy%2Fgromacs.git

Fix MSVC build
---

diff --git a/src/gromacs/gmxpreprocess/grompp.cpp b/src/gromacs/gmxpreprocess/grompp.cpp
index 6e9b8d4764..2bbc9523fe 100644
--- a/src/gromacs/gmxpreprocess/grompp.cpp
+++ b/src/gromacs/gmxpreprocess/grompp.cpp
@@ -39,6 +39,7 @@
 
 #include "grompp.h"
 
+#include <array>
 #include <cerrno>
 #include <climits>
 #include <cmath>
@@ -122,7 +123,7 @@ InteractionOfType::InteractionOfType(gmx::ArrayRef<const int>  atoms,
             params.size() <= forceParam_.size(),
             gmx::formatString("Cannot have more parameters than the maximum number possible (%d)", MAXFORCEPARAM)
                     .c_str());
-    auto* forceParamIt = forceParam_.begin();
+    std::array<real, MAXFORCEPARAM>::iterator forceParamIt = forceParam_.begin();
     for (const auto param : params)
     {
         *forceParamIt++ = param;
diff --git a/src/gromacs/gmxpreprocess/vsite_parm.cpp b/src/gromacs/gmxpreprocess/vsite_parm.cpp
index 405e3f4ce8..82051635a1 100644
--- a/src/gromacs/gmxpreprocess/vsite_parm.cpp
+++ b/src/gromacs/gmxpreprocess/vsite_parm.cpp
@@ -39,6 +39,7 @@
 
 #include "vsite_parm.h"
 
+#include <array>
 #include <cmath>
 #include <cstdio>
 #include <cstring>
@@ -80,7 +81,7 @@ public:
     {
         GMX_RELEASE_ASSERT(atomIndex.size() <= atomIndex_.size(),
                            "Cannot add more atom indices than maximum number");
-        auto* atomIndexIt = atomIndex_.begin();
+        std::array<int, 4>::iterator atomIndexIt = atomIndex_.begin();
         for (const auto index : atomIndex)
         {
             *atomIndexIt++ = index;