Improve basic_json storage

danielaparker · Oct 25, 2024 · a4ede92 · a4ede92
1 parent f8f5e6e
commit a4ede92
Showing 1 changed file with 16 additions and 37 deletions.
diff --git a/include/jsoncons/basic_json.hpp b/include/jsoncons/basic_json.hpp
@@ -714,11 +714,6 @@ namespace jsoncons {
                 return *this;
             }
 
-            ~long_string_storage() noexcept
-            {
-                heap_string_factory_type::destroy(ptr_);
-            }
-
             void swap(long_string_storage& other) noexcept
             {
                 using std::swap;
@@ -832,11 +827,6 @@ namespace jsoncons {
                 return *this;
             }
 
-            ~byte_string_storage() noexcept
-            {
-                heap_string_factory_type::destroy(ptr_);
-            }
-
             void swap(byte_string_storage& other) noexcept
             {
                 using std::swap;
@@ -882,7 +872,6 @@ namespace jsoncons {
             uint8_t storage_kind_:4;
             uint8_t short_str_length_:4;
             semantic_tag tag_;
-
             pointer ptr_;
 
             template <typename... Args>
@@ -962,14 +951,6 @@ namespace jsoncons {
                 }
             }
 
-            ~array_storage() noexcept
-            {
-                if (ptr_ != nullptr)
-                {
-                    destroy();
-                }
-            }
-
             void assign(const array_storage& other)
             {
                 tag_ = other.tag_;
@@ -1099,14 +1080,6 @@ namespace jsoncons {
                 }
             }
 
-            ~object_storage() noexcept
-            {
-                if (ptr_ != nullptr)
-                {
-                    destroy();
-                }
-            }
-
             void assign(const object_storage& other)
             {
                 tag_ = other.tag_;
@@ -1852,17 +1825,29 @@ namespace jsoncons {
             switch (storage_kind())
             {
                 case json_storage_kind::long_str:
-                    destroy_var<long_string_storage>();
+                {
+                    long_string_storage::heap_string_factory_type::destroy(cast<long_string_storage>().ptr_);
                     break;
+                }
                 case json_storage_kind::byte_str:
-                    destroy_var<byte_string_storage>();
+                    byte_string_storage::heap_string_factory_type::destroy(cast<byte_string_storage>().ptr_);
                     break;
                 case json_storage_kind::array:
-                    destroy_var<array_storage>();
+                {
+                    auto& storage = cast<array_storage>();
+                    typename array_storage::array_allocator alloc{storage.ptr_->get_allocator()};
+                    std::allocator_traits<array_storage::array_allocator>::destroy(alloc, extension_traits::to_plain_pointer(storage.ptr_));
+                    std::allocator_traits<array_storage::array_allocator>::deallocate(alloc, storage.ptr_,1);
                     break;
+                }
                 case json_storage_kind::object:
-                    destroy_var<object_storage>();
+                {
+                    auto& storage = cast<object_storage>();
+                    typename object_storage::object_allocator alloc{storage.ptr_->get_allocator()};
+                    std::allocator_traits<object_storage::object_allocator>::destroy(alloc, extension_traits::to_plain_pointer(storage.ptr_));
+                    std::allocator_traits<object_storage::object_allocator>::deallocate(alloc, storage.ptr_,1);
                     break;
+                }
                 default:
                     break;
             }
@@ -1874,12 +1859,6 @@ namespace jsoncons {
             ::new (&cast<VariantType>()) VariantType(std::forward<Args>(args)...);
         }
 
-        template <typename T>
-        void destroy_var()
-        {
-            cast<T>().~T();
-        }
-
         template <typename T>
         struct identity { using type = T*; };
     public: