Removing make_static

include/glaze/json/escape_unicode.hpp

@@ -239,18 +239,16 @@ namespace glz
 {
    template <string_literal Str>
    inline constexpr auto escape_unicode = []() constexpr -> std::string_view {
-      constexpr auto escaped = []() constexpr {
+      static constexpr auto escaped = []() constexpr {
          constexpr auto output_length = detail::escaped_length(Str.sv());
-         std::array<char, output_length + 1> result{}; // + 1 for null character
+         std::array<char, output_length + 1> result; // + 1 for null character
          const auto escaped = detail::escape_json_string(Str.sv(), output_length);
          for (size_t i = 0; i < output_length; ++i) {
             result[i] = escaped[i];
          }
+         result[output_length] = '\0';
          return result;
       }();
-
-      // make_static here required for GCC 12, in the future just make escaped static
-      auto& arr = detail::make_static<escaped>::value;
-      return {arr.data(), arr.size() - 1};
+      return {escaped.data(), escaped.size() - 1};
    }();
 }

include/glaze/util/string_literal.hpp

@@ -70,27 +70,21 @@ namespace glz
 
    namespace detail
    {
-      template <std::array V>
-      struct make_static
-      {
-         static constexpr auto value = V;
-      };
-
       template <const std::string_view&... Strs>
       inline constexpr std::string_view join()
       {
-         constexpr auto joined_arr = []() {
+         // make a null terminated string_view
+         static constexpr auto joined_arr = []() {
             constexpr size_t len = (Strs.size() + ... + 0);
-            std::array<char, len + 1> arr{};
+            std::array<char, len + 1> arr;
             auto append = [i = 0, &arr](const auto& s) mutable {
                for (auto c : s) arr[i++] = c;
             };
             (append(Strs), ...);
             arr[len] = 0;
             return arr;
          }();
-         auto& static_arr = make_static<joined_arr>::value;
-         return {static_arr.data(), static_arr.size() - 1};
+         return {joined_arr.data(), joined_arr.size() - 1};
       }
    }