Author: hans Date: Mon Aug 7 12:49:31 2017 New Revision: 310288 URL: http://llvm.org/viewvc/llvm-project?rev=310288&view=rev Log: Merging r309851: ------------------------------------------------------------------------ r309851 | marshall | 2017-08-02 11:21:34 -0700 (Wed, 02 Aug 2017) | 1 line
Fix shadowing warning ------------------------------------------------------------------------ Modified: libcxx/branches/release_50/ (props changed) libcxx/branches/release_50/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp Propchange: libcxx/branches/release_50/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 7 12:49:31 2017 @@ -1,2 +1,2 @@ /libcxx/branches/apple:136569-137939 -/libcxx/trunk:309296,309307,309838,309917,309920 +/libcxx/trunk:309296,309307,309838,309851,309917,309920 Modified: libcxx/branches/release_50/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_50/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp?rev=310288&r1=310287&r2=310288&view=diff ============================================================================== --- libcxx/branches/release_50/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp (original) +++ libcxx/branches/release_50/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp Mon Aug 7 12:49:31 2017 @@ -22,7 +22,7 @@ template<typename T> struct NoDefaultAllocator : std::allocator<T> { template<typename U> struct rebind { using other = NoDefaultAllocator<U>; }; - NoDefaultAllocator(int id) : id(id) { } + NoDefaultAllocator(int id_) : id(id_) { } template<typename U> NoDefaultAllocator(const NoDefaultAllocator<U>& 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