j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #856 from bogemic/std_allocator_conformance_cpp17

Browse source 
Std allocator conformance cpp17
This commit is contained in:
Niels Lohmann 2017-12-06 21:52:52 +01:00 committed by GitHub
commit c5e731774a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/json.hpp
View file

@ -7944,12 +7944,15 @@ class basic_json
static T* create(Args&& ... args) static T* create(Args&& ... args)
{ {
AllocatorType<T> alloc; AllocatorType<T> alloc;
using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
auto deleter = [&](T * object) auto deleter = [&](T * object)
{ {
alloc.deallocate(object, 1); AllocatorTraits::deallocate(alloc, object, 1);
}; };
std::unique_ptr<T, decltype(deleter)> object(alloc.allocate(1), deleter); std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
alloc.construct(object.get(), std::forward<Args>(args)...); AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
assert(object != nullptr); assert(object != nullptr);
return object.release(); return object.release();
} }
@ -8112,37 +8115,37 @@ class basic_json
void destroy(value_t t) void destroy(value_t t)
{ {
switch (t) switch (t)
{ {
case value_t::object: case value_t::object:
{ {
AllocatorType<object_t> alloc; AllocatorType<object_t> alloc;
alloc.destroy(object); std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
alloc.deallocate(object, 1); std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
break; break;
} }
case value_t::array: case value_t::array:
{ {
AllocatorType<array_t> alloc; AllocatorType<array_t> alloc;
alloc.destroy(array); std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
alloc.deallocate(array, 1); std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
break; break;
} }
case value_t::string: case value_t::string:
{ {
AllocatorType<string_t> alloc; AllocatorType<string_t> alloc;
alloc.destroy(string); std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
alloc.deallocate(string, 1); std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
break; break;
} }
default: default:
{ {
break; break;
} }
} }
} }
}; };