Merge pull request #1883 from nkolotov/fix/issues/1882

Fixed -Wshadow warning.
2021-05-06 09:54:52 +08:00 · 2021-05-06 09:54:52 +08:00 · 25fa7a119d
commit 25fa7a119d
parent e0f68a4356 3aa8d04b74
1 changed files with 2 additions and 2 deletions
--- a/include/rapidjson/allocators.h
+++ b/include/rapidjson/allocators.h
@ -660,9 +660,9 @@ public:
    { }

    /* implicit */
-    StdAllocator(const BaseAllocator& allocator) RAPIDJSON_NOEXCEPT :
+    StdAllocator(const BaseAllocator& baseAllocator) RAPIDJSON_NOEXCEPT :
        allocator_type(),
-        baseAllocator_(allocator)
+        baseAllocator_(baseAllocator)
    { }

    ~StdAllocator() RAPIDJSON_NOEXCEPT