mirror of
https://github.com/nlohmann/json.git
synced 2024-07-23 22:51:53 +02:00
Merge pull request #2536 from nlohmann/shadowing
Fix a shadowing warning
This commit is contained in:
commit
45810082d4
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////
|
////////////////////////
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////
|
////////////////////////
|
||||||
|
|
Loading…
Reference in a new issue