From f84983aa565790d9a910521cf95cec0a631dc9ca Mon Sep 17 00:00:00 2001 From: vcdiff <181155601+vcdiff@users.noreply.github.com> Date: Mon, 30 Jun 2025 17:37:46 -0700 Subject: [PATCH] Fix std::allocator deprecations --- src/ZoneUtils/Json.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ZoneUtils/Json.hpp b/src/ZoneUtils/Json.hpp index 891c6889..2627f193 100644 --- a/src/ZoneUtils/Json.hpp +++ b/src/ZoneUtils/Json.hpp @@ -794,7 +794,7 @@ namespace nlohmann alloc.deallocate(object, 1); }; std::unique_ptr object(alloc.allocate(1), deleter); - alloc.construct(object.get(), std::forward(args)...); + std::allocator_traits::construct(alloc, object.get(), std::forward(args)...); assert(object.get() != nullptr); return object.release(); } @@ -2165,24 +2165,24 @@ namespace nlohmann case value_t::object: { AllocatorType alloc; - alloc.destroy(m_value.object); - alloc.deallocate(m_value.object, 1); + std::allocator_traits::destroy(alloc, m_value.object); + std::allocator_traits::deallocate(alloc, m_value.object, 1); break; } case value_t::array: { AllocatorType alloc; - alloc.destroy(m_value.array); - alloc.deallocate(m_value.array, 1); + std::allocator_traits::destroy(alloc, m_value.array); + std::allocator_traits::deallocate(alloc, m_value.array, 1); break; } case value_t::string: { AllocatorType alloc; - alloc.destroy(m_value.string); - alloc.deallocate(m_value.string, 1); + std::allocator_traits::destroy(alloc, m_value.string); + std::allocator_traits::deallocate(alloc, m_value.string, 1); break; }