Skip to content

Commit f25261c

Browse files
authored
Removing default instantiation and cleaning (#1516)
* Removing default instantiation and cleaning * fix variable rename
1 parent e87fc89 commit f25261c

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

include/glaze/json/escape_unicode.hpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,13 @@ namespace glz
240240
template <string_literal Str>
241241
inline constexpr auto escape_unicode = []() constexpr -> std::string_view {
242242
constexpr auto escaped = []() constexpr {
243-
constexpr auto output_length = detail::escaped_length(Str.sv());
244-
std::array<char, output_length + 1> result{}; // + 1 for null character
245-
const auto escaped = detail::escape_json_string(Str.sv(), output_length);
246-
for (size_t i = 0; i < output_length; ++i) {
243+
constexpr auto len = detail::escaped_length(Str.sv());
244+
std::array<char, len + 1> result; // + 1 for null character
245+
const auto escaped = detail::escape_json_string(Str.sv(), len);
246+
for (size_t i = 0; i < len; ++i) {
247247
result[i] = escaped[i];
248248
}
249+
result[len] = '\0';
249250
return result;
250251
}();
251252

include/glaze/util/string_literal.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ namespace glz
8181
{
8282
constexpr auto joined_arr = []() {
8383
constexpr size_t len = (Strs.size() + ... + 0);
84-
std::array<char, len + 1> arr{};
84+
std::array<char, len + 1> arr;
8585
auto append = [i = 0, &arr](const auto& s) mutable {
8686
for (auto c : s) arr[i++] = c;
8787
};
8888
(append(Strs), ...);
89-
arr[len] = 0;
89+
arr[len] = '\0';
9090
return arr;
9191
}();
9292
auto& static_arr = make_static<joined_arr>::value;

include/glaze/util/tuple.hpp

+1-11
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@ namespace glz
1515
template <class T>
1616
concept is_std_tuple = is_specialization_v<T, std::tuple>;
1717

18-
// group builder code
19-
template <size_t N>
20-
constexpr auto shrink_index_array(auto&& arr)
21-
{
22-
std::array<size_t, N> res{};
23-
for (size_t i = 0; i < N; ++i) {
24-
res[i] = arr[i];
25-
}
26-
return res;
27-
}
28-
18+
// TODO: This doesn't appear to be used. Should it be removed?
2919
template <class Type>
3020
concept is_schema_class = requires {
3121
requires std::is_class_v<Type>;

0 commit comments

Comments
 (0)