amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-23 22:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

2.2.10: merge destroy_string/destroy_binary into destroy_pointer (#5891)

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-23 10:29:21 +02:00
1 parent 99aee52002
commit 0c804e0ad7
1 file changed
+8 -19
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/json.hpp
+8 -19
View File
@@ -845,28 +845,17 @@ private:
}
public:
void destroy_string() noexcept
template<typename T>
static void destroy_pointer(T*& ptr) noexcept
{
if (string == nullptr)
if (ptr == nullptr)
{
// not initialized (e.g., due to exception in the ctor)
return;
}
AllocatorType<string_t> alloc;
std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
}
void destroy_binary() noexcept
{
if (binary == nullptr)
{
// not initialized (e.g., due to exception in the ctor)
return;
}
AllocatorType<binary_t> alloc;
std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
AllocatorType<T> alloc;
std::allocator_traits<decltype(alloc)>::destroy(alloc, ptr);
std::allocator_traits<decltype(alloc)>::deallocate(alloc, ptr, 1);
}
// t must be value_t::array or value_t::object
@@ -1032,11 +1021,11 @@ public:
switch (t)
{
case value_t::string:
destroy_string();
destroy_pointer(string);
break;
case value_t::binary:
destroy_binary();
destroy_pointer(binary);
break;
case value_t::object: