haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-02 20:36:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

🚨 remove C4996 warnings #872

Browse source 
These were the remaining direct calls to alloc.
This commit is contained in:
Niels Lohmann 2017-12-13 17:01:39 +01:00
parent f7ae143a93
commit a9a4ff61c6
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/json.hpp
View file

@ -8028,7 +8028,6 @@ class basic_json
static T* create(Args&& ... args)
{
AllocatorType<T> alloc;
using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
auto deleter = [&](T * object)
@ -10719,8 +10718,8 @@ class basic_json
if (is_string())
{
AllocatorType<string_t> alloc;
alloc.destroy(m_value.string);
alloc.deallocate(m_value.string, 1);
std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
m_value.string = nullptr;
}
@ -10825,8 +10824,8 @@ class basic_json
if (is_string())
{
AllocatorType<string_t> alloc;
alloc.destroy(m_value.string);
alloc.deallocate(m_value.string, 1);
std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
m_value.string = nullptr;
}