From 1210c3e11b05e1012dc16e35d6fddc11898af72e Mon Sep 17 00:00:00 2001 From: barcode Date: Tue, 3 Jan 2023 23:18:16 +0100 Subject: [PATCH] Add and use basic_json::data(size_type, const basic_json&) --- include/nlohmann/json.hpp | 11 ++++++++--- single_include/nlohmann/json.hpp | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index ae14a79df..b80e07ef7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1016,10 +1016,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec /// @brief construct an array with count copies of given value /// @sa https://json.nlohmann.me/api/basic_json/basic_json/ - basic_json(size_type cnt, const basic_json& val) + basic_json(size_type cnt, const basic_json& val): + m_data{cnt, val} { - m_data.m_type = value_t::array; - m_data.m_value.array = create(cnt, val); set_parents(); assert_invariant(); } @@ -4207,6 +4206,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec { } + data(size_type cnt, const basic_json& val) + : m_type(value_t::array) + { + m_value.array = create(cnt, val); + } + data() noexcept = default; data(data&&) noexcept = default; data(const data&) noexcept = delete; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index d8cb8c97c..dbbe68458 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -20232,10 +20232,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec /// @brief construct an array with count copies of given value /// @sa https://json.nlohmann.me/api/basic_json/basic_json/ - basic_json(size_type cnt, const basic_json& val) + basic_json(size_type cnt, const basic_json& val): + m_data{cnt, val} { - m_data.m_type = value_t::array; - m_data.m_value.array = create(cnt, val); set_parents(); assert_invariant(); } @@ -23423,6 +23422,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec { } + data(size_type cnt, const basic_json& val) + : m_type(value_t::array) + { + m_value.array = create(cnt, val); + } + data() noexcept = default; data(data&&) noexcept = default; data(const data&) noexcept = delete;