Merge pull request #1883 from nkolotov/fix/issues/1882
Fixed -Wshadow warning.
This commit is contained in:
commit
25fa7a119d
@ -660,9 +660,9 @@ public:
|
|||||||
{ }
|
{ }
|
||||||
|
|
||||||
/* implicit */
|
/* implicit */
|
||||||
StdAllocator(const BaseAllocator& allocator) RAPIDJSON_NOEXCEPT :
|
StdAllocator(const BaseAllocator& baseAllocator) RAPIDJSON_NOEXCEPT :
|
||||||
allocator_type(),
|
allocator_type(),
|
||||||
baseAllocator_(allocator)
|
baseAllocator_(baseAllocator)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
~StdAllocator() RAPIDJSON_NOEXCEPT
|
~StdAllocator() RAPIDJSON_NOEXCEPT
|
||||||
|
Loading…
x
Reference in New Issue
Block a user