Re: [libcxx] r309851 - Fix shadowing warning

2017-08-07 Thread Hans Wennborg via cfe-commits 
On Wed, Aug 2, 2017 at 11:21 AM, Marshall Clow via cfe-commits
 wrote:
> Author: marshall
> Date: Wed Aug  2 11:21:34 2017
> New Revision: 309851
>
> URL: http://llvm.org/viewvc/llvm-project?rev=309851=rev
> Log:
> Fix shadowing warning

Merged to 5.0 in r310288.
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[libcxx] r309851 - Fix shadowing warning

2017-08-02 Thread Marshall Clow via cfe-commits 
Author: marshall
Date: Wed Aug  2 11:21:34 2017
New Revision: 309851

URL: http://llvm.org/viewvc/llvm-project?rev=309851=rev
Log:
Fix shadowing warning

Modified:

libcxx/trunk/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp

Modified: 
libcxx/trunk/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp?rev=309851=309850=309851=diff
==
--- 
libcxx/trunk/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
 Wed Aug  2 11:21:34 2017
@@ -22,7 +22,7 @@ template
 struct NoDefaultAllocator : std::allocator
 {
   template struct rebind { using other = NoDefaultAllocator; };
-  NoDefaultAllocator(int id) : id(id) { }
+  NoDefaultAllocator(int id_) : id(id_) { }
   template NoDefaultAllocator(const NoDefaultAllocator& a) : 
id(a.id) { }
   int id;
 };


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits