Remove polymorphic allocator

Author: danielaparker

include/jsoncons/basic_json.hpp

@@ -826,7 +826,7 @@ namespace jsoncons {
             array_storage(const array& val, semantic_tag tag, const Allocator& a)
                 : storage_kind_(val.storage_kind_), length_(0), tag_(tag)
             {
-                create(array_allocator(a), val);
+                create(array_allocator(a), val, a);
             }
 
             array_storage(const array_storage& val)
@@ -845,7 +845,7 @@ namespace jsoncons {
             array_storage(const array_storage& val, const Allocator& a)
                 : storage_kind_(val.storage_kind_), length_(0), tag_(val.tag_)
             {
-                create(array_allocator(a), *(val.ptr_));
+                create(array_allocator(a), *(val.ptr_), a);
             }
             ~array_storage() noexcept
             {
@@ -919,7 +919,7 @@ namespace jsoncons {
             explicit object_storage(const object& val, semantic_tag tag, const Allocator& a)
                 : storage_kind_(val.storage_kind_), length_(0), tag_(tag)
             {
-                create(object_allocator(a), val);
+                create(object_allocator(a), val, a);
             }
 
             explicit object_storage(const object_storage& val)
@@ -938,7 +938,7 @@ namespace jsoncons {
             explicit object_storage(const object_storage& val, const Allocator& a)
                 : storage_kind_(val.storage_kind_), length_(0), tag_(val.tag_)
             {
-                create(object_allocator(a), *(val.ptr_));
+                create(object_allocator(a), *(val.ptr_), a);
             }
 
             ~object_storage() noexcept
@@ -2946,12 +2946,16 @@ namespace jsoncons {
             construct<empty_object_storage>(tag);
         }
 
-        // Undeprecated
-        explicit basic_json(const Allocator&) 
+    #if !defined(JSONCONS_NO_DEPRECATED)
+
+        JSONCONS_DEPRECATED_MSG("Instead, use basic_json(json_object_t,semantic_tag,const Allocator&)")
+        explicit basic_json(const Allocator& alloc, semantic_tag tag = semantic_tag::none) 
         {
-            construct<empty_object_storage>(semantic_tag::none);
+            construct<object_storage>(object(alloc), tag);
         }
 
+    #endif
+
         basic_json(const basic_json& other)
         {
             Init_(other);

include/jsoncons/json_object.hpp

@@ -61,8 +61,8 @@ namespace jsoncons {
     public:
         using key_type = KeyT;
         using value_type = ValueT;
-        using string_view_type = typename value_type::string_view_type;
         using allocator_type = typename ValueT::allocator_type;
+        using string_view_type = typename value_type::string_view_type;
     private:
 
         key_type key_;
@@ -95,38 +95,15 @@ namespace jsoncons {
         {
         }
 
-        template <typename... Args>
-        key_value(const key_type& name,  Args&& ... args, const allocator_type& alloc)
-            : key_(name, alloc), value_(std::forward<Args>(args)..., alloc)
-        {
-        }
-
-        template <typename... Args>
-        key_value(key_type&& name,  Args&& ... args, const allocator_type& alloc) noexcept
-            : key_(std::move(name),alloc), value_(std::forward<Args>(args)...,alloc)
-        {
-        }
-
         key_value(const key_value& member)
             : key_(member.key_), value_(member.value_)
         {
         }
 
-        key_value(const key_value& member, const allocator_type& alloc)
-            : key_(member.key_, alloc), value_(member.value_, alloc)
-        {
-        }
-
         key_value(key_value&& member) noexcept
             : key_(std::move(member.key_)), value_(std::move(member.value_))
         {
         }
-
-        key_value(key_value&& member, const allocator_type& alloc) noexcept
-            : key_(std::move(member.key_), alloc), value_(std::move(member.value_), alloc)
-        {
-        }
-
         template <typename... U1, typename... U2>
         JSONCONS_CONSTEXPR key_value(std::piecewise_construct_t /*unused*/, std::tuple<U1...> a,
                  std::tuple<U2...>
@@ -339,23 +316,12 @@ namespace jsoncons {
         {
         }
 
-        sorted_json_object(const sorted_json_object& val, const allocator_type& alloc) 
-            : allocator_holder<allocator_type>(alloc), 
-              members_(val.members_,key_value_allocator_type(alloc))
-        {
-        }
-
         sorted_json_object(sorted_json_object&& val)
             : allocator_holder<allocator_type>(val.get_allocator()), 
               members_(std::move(val.members_))
         {
         }
 
-        sorted_json_object(sorted_json_object&& val,const allocator_type& alloc) 
-            : allocator_holder<allocator_type>(alloc), members_(std::move(val.members_),key_value_allocator_type(alloc))
-        {
-        }
-
         sorted_json_object& operator=(const sorted_json_object& val)
         {
             allocator_holder<allocator_type>::operator=(val.get_allocator());
@@ -369,6 +335,17 @@ namespace jsoncons {
             return *this;
         }
 
+        sorted_json_object(const sorted_json_object& val, const allocator_type& alloc) 
+            : allocator_holder<allocator_type>(alloc), 
+              members_(val.members_,key_value_allocator_type(alloc))
+        {
+        }
+
+        sorted_json_object(sorted_json_object&& val,const allocator_type& alloc) 
+            : allocator_holder<allocator_type>(alloc), members_(std::move(val.members_),key_value_allocator_type(alloc))
+        {
+        }
+
         template<class InputIt>
         sorted_json_object(InputIt first, InputIt last)
         {
@@ -690,7 +667,8 @@ namespace jsoncons {
             }
             else
             {
-                it = members_.emplace(it, key_type(name.begin(),name.end()),
+                it = members_.emplace(it,
+                                            key_type(name.begin(),name.end()),
                                             std::forward<Args>(args)...);
                 inserted = true;
             }
@@ -1094,13 +1072,6 @@ namespace jsoncons {
         {
         }
 
-        order_preserving_json_object(order_preserving_json_object&& val,const allocator_type& alloc) 
-            : allocator_holder<allocator_type>(alloc), 
-              members_(std::move(val.members_),key_value_allocator_type(alloc)),
-              index_(std::move(val.index_),index_allocator_type(alloc))
-        {
-        }
-
         order_preserving_json_object(order_preserving_json_object&& val)
             : allocator_holder<allocator_type>(val.get_allocator()), 
               members_(std::move(val.members_)),
@@ -1115,6 +1086,13 @@ namespace jsoncons {
         {
         }
 
+        order_preserving_json_object(order_preserving_json_object&& val,const allocator_type& alloc) 
+            : allocator_holder<allocator_type>(alloc), 
+              members_(std::move(val.members_),key_value_allocator_type(alloc)),
+              index_(std::move(val.index_),index_allocator_type(alloc))
+        {
+        }
+
         template<class InputIt>
         order_preserving_json_object(InputIt first, InputIt last)
         {