diff --git a/include/nodejs/json_v8_renderer.hpp b/include/nodejs/json_v8_renderer.hpp index 9572744c2..a6b424da6 100644 --- a/include/nodejs/json_v8_renderer.hpp +++ b/include/nodejs/json_v8_renderer.hpp @@ -30,7 +30,7 @@ struct V8Renderer { Napi::Value child; std::visit(V8Renderer(env, child), keyValue.second); - obj.Set(keyValue.first, child); + obj.Set(keyValue.first.data(), child); } out = obj; } diff --git a/include/util/json_container.hpp b/include/util/json_container.hpp index 14ca9d52f..728b6e3e9 100644 --- a/include/util/json_container.hpp +++ b/include/util/json_container.hpp @@ -104,7 +104,7 @@ using Value = std::variant; */ struct Object { - std::unordered_map values; + std::unordered_map values; }; /** diff --git a/include/util/json_deep_compare.hpp b/include/util/json_deep_compare.hpp index 24b226ca7..d57f9cde1 100644 --- a/include/util/json_deep_compare.hpp +++ b/include/util/json_deep_compare.hpp @@ -44,13 +44,13 @@ struct Comparator bool operator()(const Object &lhs, const Object &rhs) const { - std::set lhs_keys; + std::set lhs_keys; for (const auto &key_value : lhs.values) { lhs_keys.insert(key_value.first); } - std::set rhs_keys; + std::set rhs_keys; for (const auto &key_value : rhs.values) { rhs_keys.insert(key_value.first); @@ -60,7 +60,7 @@ struct Comparator { if (rhs_keys.find(key) == rhs_keys.end()) { - reason = rhs_path + " doesn't have key \"" + key + "\""; + reason = rhs_path + " doesn't have key \"" + std::string(key) + "\""; return false; } } @@ -69,7 +69,7 @@ struct Comparator { if (lhs_keys.find(key) == lhs_keys.end()) { - reason = lhs_path + " doesn't have key \"" + key + "\""; + reason = lhs_path + " doesn't have key \"" + std::string(key) + "\""; return false; } } @@ -82,7 +82,7 @@ struct Comparator const auto &rhs_child = rhs.values.find(key)->second; const auto &lhs_child = lhs.values.find(key)->second; auto is_same = - std::visit(Comparator(reason, lhs_path + "." + key, rhs_path + "." + key), + std::visit(Comparator(reason, lhs_path + "." + std::string(key), rhs_path + "." + std::string(key)), lhs_child, rhs_child); if (!is_same) diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp index d1adfcce6..bdc3dcae0 100644 --- a/include/util/json_renderer.hpp +++ b/include/util/json_renderer.hpp @@ -97,7 +97,7 @@ template struct Renderer void operator()(const Null &) { write<>("null"); } private: - void write(const std::string &str); + void write(std::string_view str); void write(const char *str, size_t size); void write(char ch); @@ -110,7 +110,7 @@ template struct Renderer Out &out; }; -template <> void Renderer>::write(const std::string &str) +template <> void Renderer>::write(std::string_view str) { out.insert(out.end(), str.begin(), str.end()); } @@ -122,7 +122,7 @@ template <> void Renderer>::write(const char *str, size_t size template <> void Renderer>::write(char ch) { out.push_back(ch); } -template <> void Renderer::write(const std::string &str) { out << str; } +template <> void Renderer::write(std::string_view str) { out << str; } template <> void Renderer::write(const char *str, size_t size) { @@ -131,7 +131,7 @@ template <> void Renderer::write(const char *str, size_t size) template <> void Renderer::write(char ch) { out << ch; } -template <> void Renderer::write(const std::string &str) { out += str; } +template <> void Renderer::write(std::string_view str) { out += str; } template <> void Renderer::write(const char *str, size_t size) {