From: M. Eric Irrgang <mei2n@virginia.edu>
Date: Wed, 9 Sep 2020 17:34:13 +0000 (+0000)
Subject: Explicitly include STL headers used in test.
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=963d20a256112d0e5f523668573d2c01e94e1b65;p=alexxy%2Fgromacs.git

Explicitly include STL headers used in test.

Include `array` and `optional` in strconvert.cpp test.

Fixes #3657
---

diff --git a/src/gromacs/applied_forces/densityfitting/densityfittingparameters.h b/src/gromacs/applied_forces/densityfitting/densityfittingparameters.h
index 5cfef20dc0..024c71f312 100644
--- a/src/gromacs/applied_forces/densityfitting/densityfittingparameters.h
+++ b/src/gromacs/applied_forces/densityfitting/densityfittingparameters.h
@@ -42,6 +42,7 @@
 #ifndef GMX_APPLIED_FORCES_DENSITYFITTINGPARAMETERS_H
 #define GMX_APPLIED_FORCES_DENSITYFITTINGPARAMETERS_H
 
+#include <string>
 #include <vector>
 
 #include "gromacs/math/densityfit.h"
diff --git a/src/gromacs/utility/strconvert.h b/src/gromacs/utility/strconvert.h
index c48e25748e..805717fb7e 100644
--- a/src/gromacs/utility/strconvert.h
+++ b/src/gromacs/utility/strconvert.h
@@ -45,6 +45,7 @@
 #define GMX_UTILITY_STRCONVERT_H
 
 #include <algorithm>
+#include <array>
 #include <optional>
 #include <string>
 
diff --git a/src/gromacs/utility/tests/strconvert.cpp b/src/gromacs/utility/tests/strconvert.cpp
index cbf8f6f767..73730fcf06 100644
--- a/src/gromacs/utility/tests/strconvert.cpp
+++ b/src/gromacs/utility/tests/strconvert.cpp
@@ -56,15 +56,13 @@ namespace
 
 TEST(StringConvert, NoResultFromEptyString)
 {
-    const std::optional<std::array<float, 3>> parsedArray =
-            parsedArrayFromInputString<float, 3>("");
+    const auto parsedArray = parsedArrayFromInputString<float, 3>("");
     EXPECT_FALSE(parsedArray);
 }
 
 TEST(StringConvert, ThreeFloatsSuccessfully)
 {
-    const std::optional<std::array<float, 3>> parsedArray =
-            parsedArrayFromInputString<float, 3>("1.2 .5 -6e5");
+    const auto parsedArray = parsedArrayFromInputString<float, 3>("1.2 .5 -6e5");
     EXPECT_FLOAT_EQ((*parsedArray)[0], 1.2);
     EXPECT_FLOAT_EQ((*parsedArray)[1], .5);
     EXPECT_FLOAT_EQ((*parsedArray)[2], -6e5);
@@ -72,8 +70,7 @@ TEST(StringConvert, ThreeFloatsSuccessfully)
 
 TEST(StringConvert, OneIntSucessfully)
 {
-    const std::optional<std::array<int, 1>> parsedArray =
-            parsedArrayFromInputString<int, 1>(" 1 \t  ");
+    const auto parsedArray = parsedArrayFromInputString<int, 1>(" 1 \t  ");
     EXPECT_FLOAT_EQ((*parsedArray)[0], 1);
 }