Revert "feat: json::value 支持直接通过 array/object 的可构造参数构造"

This reverts commit 99eb9d7. #25
MistEO · Oct 16, 2023 · a1668f5 · a1668f5
1 parent 99eb9d7
commit a1668f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/include/json.hpp b/include/json.hpp
@@ -92,13 +92,14 @@ class basic_value
     basic_value(basic_object<string_t> obj);
     basic_value(std::initializer_list<std::pair<string_t, basic_value<string_t>>> init_list);
 
-    template <typename value_t>
-    basic_value(value_t&& val);
-
     // Constructed from raw data
     template <typename... args_t>
     basic_value(value_type type, args_t&&... args);
 
+    // Prohibit conversion of other types to basic_value
+    template <typename value_t>
+    basic_value(value_t) = delete;
+
     ~basic_value();
 
     bool valid() const noexcept { return _type != value_type::invalid; }
@@ -707,25 +708,6 @@ MEOJSON_INLINE basic_value<string_t>::basic_value(
     ;
 }
 
-template <typename string_t>
-template <typename value_t>
-MEOJSON_INLINE basic_value<string_t>::basic_value(value_t&& val)
-{
-    constexpr bool is_array_val = std::is_constructible_v<basic_array<string_t>, value_t>;
-    constexpr bool is_object_val = std::is_constructible_v<basic_object<string_t>, value_t>;
-
-    static_assert(is_array_val || is_object_val, "value can not constructure a array or object");
-
-    if constexpr (is_array_val) {
-        _type = value_type::array;
-        _raw_data = std::make_unique<basic_array<string_t>>(std::forward<value_t>(val));
-    }
-    else if constexpr (is_object_val) {
-        _type = value_type::object;
-        _raw_data = std::make_unique<basic_object<string_t>>(std::forward<value_t>(val));
-    }
-}
-
 // for Pimpl
 template <typename string_t>
 MEOJSON_INLINE basic_value<string_t>::~basic_value() = default;

diff --git a/sample/sample.cpp b/sample/sample.cpp
@@ -227,16 +227,16 @@ bool serializing()
     root["arr"] += json::array { 6, 7 };
 
     std::vector<int> vec = { 1, 2, 3, 4, 5 };
-    root["arr from vec"] = vec;
+    root["arr from vec"] = json::array(vec);
 
     std::set<std::string> set = { "a", "bb\n\nb", "cc\t" };
-    root["arr from set"] = set;
+    root["arr from set"] = json::array(set);
 
     std::map<std::string, int> map {
         { "key1", 1 },
         { "key2", 2 },
     };
-    root["obj from map"] = map;
+    root["obj from map"] = json::object(map);
 
     std::vector<std::list<std::set<int>>> complex { { { 1, 2, 3 }, { 4, 5 } }, { { 6 }, { 7, 8 } } };
     root["complex"] = json::serialize<false>(complex);