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

miloyip · web-flow · commit 25fa7a119d2b · 2021-05-06T09:54:52.000+08:00
Fixed -Wshadow warning.
diff --git a/include/rapidjson/allocators.h b/include/rapidjson/allocators.h
@@ -660,9 +660,9 @@ class StdAllocator<void, BaseAllocator> :
     { }
 
     /* implicit */
-    StdAllocator(const BaseAllocator& allocator) RAPIDJSON_NOEXCEPT :
+    StdAllocator(const BaseAllocator& baseAllocator) RAPIDJSON_NOEXCEPT :
         allocator_type(),
-        baseAllocator_(allocator)
+        baseAllocator_(baseAllocator)
     { }
 
     ~StdAllocator() RAPIDJSON_NOEXCEPT
