Merge pull request #22 from Progmasoft/build/cpp17

Build Catch3 as C++17

1 files changed, 27 insertions, 17 deletions

diff --git a/src/Progmasoft/Runner/Process.cpp b/src/Progmasoft/Runner/Process.cpp
index 8ef02327..585822f3 100644
--- a/src/Progmasoft/Runner/Process.cpp
+++ b/src/Progmasoft/Runner/Process.cpp
@@ -191,18 +191,22 @@ namespace Progmasoft::Catch3::Runner
             for (const auto &[name, value] : additions)
             {
                 const std::wstring wideName = Widen(name);
-                std::erase_if(entries, [&](const std::wstring &entry) {
-                    // A leading '=' marks the hidden per-drive variables.
-                    const auto equals = entry.find(L'=', 1);
-                    return equals == wideName.size()
-                           && CompareStringOrdinal(
-                                  entry.data(),
-                                  static_cast<int>(equals),
-                                  wideName.data(),
-                                  static_cast<int>(wideName.size()),
-                                  TRUE)
-                                  == CSTR_EQUAL;
-                });
+                const auto removed = std::remove_if(
+                    entries.begin(),
+                    entries.end(),
+                    [&](const std::wstring &entry) {
+                        // A leading '=' marks the hidden per-drive variables.
+                        const auto equals = entry.find(L'=', 1);
+                        return equals == wideName.size()
+                               && CompareStringOrdinal(
+                                      entry.data(),
+                                      static_cast<int>(equals),
+                                      wideName.data(),
+                                      static_cast<int>(wideName.size()),
+                                      TRUE)
+                                      == CSTR_EQUAL;
+                    });
+                entries.erase(removed, entries.end());
                 entries.push_back(wideName + L"=" + Widen(value));
             }
             std::wstring block;
@@ -957,11 +961,17 @@ namespace Progmasoft::Catch3::Runner
         }
         for (const auto &[name, value] : options.environment)
         {
-            std::erase_if(environmentStorage, [&](const std::string &entry) {
-                return entry.size() > name.size()
-                       && entry.compare(0, name.size(), name) == 0
-                       && entry[name.size()] == '=';
-            });
+            // 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() > variable.size()
+                           && entry.compare(0, variable.size(), variable) == 0
+                           && entry[variable.size()] == '=';
+                });
+            environmentStorage.erase(removed, environmentStorage.end());
             environmentStorage.push_back(name + "=" + value);
         }
         std::vector<char *> environment;