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 5cfef20dc0f582c20797a0885256fbee8bb5098f..024c71f312a23e455cd4032d954a0f3ca9927009 100644 (file)
--- 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 c48e25748eb9d5265ba64d8556545a2e5394b039..805717fb7e5ec7678da375d515d3306a0def8bc2 100644 (file)
--- 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 cbf8f6f76791a5110dc103a2a8eff4abbb1ea1e6..73730fcf0625fe81353bc19bad440a7a42ac8ec5 100644 (file)
--- 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);
 }