Finish the move to C++17 in POSIX code and the amalgamated filesbuild/cpp17

A lambda in the POSIX half of Process.cpp captured a structured binding,
which needs C++20 and which a Windows build never compiles. The files in
extras still held the C++20 sources, so they are generated again, and the
generator no longer says the runner needs C++20.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Progmasoft/Runner/Process.cpp b/src/Progmasoft/Runner/Process.cpp
index d0b5b512..585822f3 100644
--- a/src/Progmasoft/Runner/Process.cpp
+++ b/src/Progmasoft/Runner/Process.cpp
@@ -961,13 +961,15 @@ namespace Progmasoft::Catch3::Runner
         }
         for (const auto &[name, value] : options.environment)
         {
+            // A lambda cannot capture a structured binding in C++17.
+            const std::string &variable = name;
             const auto removed = std::remove_if(
                 environmentStorage.begin(),
                 environmentStorage.end(),
                 [&](const std::string &entry) {
-                    return entry.size() > name.size()
-                           && entry.compare(0, name.size(), name) == 0
-                           && entry[name.size()] == '=';
+                    return entry.size() > variable.size()
+                           && entry.compare(0, variable.size(), variable) == 0
+                           && entry[variable.size()] == '=';
                 });
             environmentStorage.erase(removed, environmentStorage.end());
             environmentStorage.push_back(name + "=" + value);