Merge branch 'var_copy' into 'master'

Do not copy vector See merge request OpenMW/openmw!3401
OpenMW · Sep 5, 2023 · 58a3fcb · 58a3fcb
2 parents 1a4b29f + a849a05
commit 58a3fcb
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/components/lua/utf8.cpp b/components/lua/utf8.cpp
@@ -110,18 +110,19 @@ namespace LuaUtf8
         };
 
         utf8["codes"] = [](std::string_view s) {
-            std::vector<int64_t> pos_byte{ 1 };
-            return sol::as_function([s, pos_byte]() mutable -> sol::optional<std::pair<int64_t, int64_t>> {
-                if (pos_byte.back() <= static_cast<int64_t>(s.size()))
-                {
-                    const auto pair = decodeNextUTF8Character(s, pos_byte);
-                    if (pair.second == -1)
-                        throw std::runtime_error("Invalid UTF-8 code at position " + std::to_string(pos_byte.size()));
-
-                    return pair;
-                }
-                return sol::nullopt;
-            });
+            return sol::as_function(
+                [s, pos_byte = std::vector<int64_t>{ 1 }]() mutable -> sol::optional<std::pair<int64_t, int64_t>> {
+                    if (pos_byte.back() <= static_cast<int64_t>(s.size()))
+                    {
+                        const auto pair = decodeNextUTF8Character(s, pos_byte);
+                        if (pair.second == -1)
+                            throw std::runtime_error(
+                                "Invalid UTF-8 code at position " + std::to_string(pos_byte.size()));
+
+                        return pair;
+                    }
+                    return sol::nullopt;
+                });
         };
 
         utf8["len"] = [](std::string_view s,