lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

🚨 fix shadowing warning

Browse Source
This commit is contained in:
Niels Lohmann
2020-12-15 22:15:36 +01:00
parent 2fc1f694ad
commit 5cc5285fe8
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/nlohmann/json.hpp
View File

@ -923,14 +923,14 @@ class basic_json
AllocatorType<T> alloc; AllocatorType<T> alloc;
using AllocatorTraits = std::allocator_traits<AllocatorType<T>>; using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
auto deleter = [&](T * object) auto deleter = [&](T * obj)
{ {
AllocatorTraits::deallocate(alloc, object, 1); AllocatorTraits::deallocate(alloc, obj, 1);
}; };
std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter); std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...); AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
JSON_ASSERT(object != nullptr); JSON_ASSERT(obj != nullptr);
return object.release(); return obj.release();
} }
//////////////////////// ////////////////////////

12
single_include/nlohmann/json.hpp
View File

@ -17495,14 +17495,14 @@ class basic_json
AllocatorType<T> alloc; AllocatorType<T> alloc;
using AllocatorTraits = std::allocator_traits<AllocatorType<T>>; using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
auto deleter = [&](T * object) auto deleter = [&](T * obj)
{ {
AllocatorTraits::deallocate(alloc, object, 1); AllocatorTraits::deallocate(alloc, obj, 1);
}; };
std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter); std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...); AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
JSON_ASSERT(object != nullptr); JSON_ASSERT(obj != nullptr);
return object.release(); return obj.release();
} }
//////////////////////// ////////////////////////