[libc++] Add braces, move braces, and rename variables to avoid shadowing.

[STL_MSFT]

Summary

[libc++] Add braces, move braces, and rename variables to avoid shadowing.

Fixes MSVC "warning C4456: declaration of 'meow' hides previous local declaration".

[EricWF]

I hope the actual warning says 'meow' in all cases.

[EricWF]

r267844.

test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp

test_larger_sorts(unsigned N)
     test_larger_sorts(N, N/2+1);
     test_larger_sorts(N, N-2);
     test_larger_sorts(N, N-1);
     test_larger_sorts(N, N);
 }
 
 int main()
 {
+    {
     int i = 0;
     std::partial_sort(&i, &i, &i);
     assert(i == 0);
     test_larger_sorts(10);
     test_larger_sorts(256);
     test_larger_sorts(257);
     test_larger_sorts(499);
     test_larger_sorts(500);
     test_larger_sorts(997);
     test_larger_sorts(1000);
     test_larger_sorts(1009);
+    }
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     {
     std::vector<std::unique_ptr<int> > v(1000);
     for (int i = 0; i < v.size(); ++i)
         v[i].reset(new int(i));
     std::partial_sort(v.begin(), v.begin() + v.size()/2, v.end(), indirect_less());
     for (int i = 0; i < v.size()/2; ++i)
         assert(*v[i] == i);
     }
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }

test/std/containers/associative/multiset/iterator.pass.cpp

int main()
         std::multiset<int> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
         assert(std::distance(m.begin(), m.end()) == m.size());
         assert(std::distance(m.rbegin(), m.rend()) == m.size());
         std::multiset<int>::iterator i;
         i = m.begin();
         std::multiset<int>::const_iterator k = i;
         assert(i == k);
         for (int j = 1; j <= 8; ++j)
-            for (int k = 0; k < 3; ++k, ++i)
+            for (int n = 0; n < 3; ++n, ++i)
                 assert(*i == j);
     }
     {
         typedef int V;
         V ar[] =
         {
             1,
             1,
#if __cplusplus >= 201103L
         std::multiset<int, std::less<int>, min_allocator<int>> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
         assert(std::distance(m.begin(), m.end()) == m.size());
         assert(std::distance(m.rbegin(), m.rend()) == m.size());
         std::multiset<int, std::less<int>, min_allocator<int>>::iterator i;
         i = m.begin();
         std::multiset<int, std::less<int>, min_allocator<int>>::const_iterator k = i;
         assert(i == k);
         for (int j = 1; j <= 8; ++j)
-            for (int k = 0; k < 3; ++k, ++i)
+            for (int n = 0; n < 3; ++n, ++i)
                 assert(*i == j);
     }
     {
         typedef int V;
         V ar[] =
         {
             1,
             1,

test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp

 #include <cassert>
 
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 
 int main()
 {
+    {
     typedef int V;
     V ar[] =
     {
         1,
         1,
         1,
         2,
         2,
int main()
     assert(*next(m.begin(), 1) == 1);
     assert(*next(m.begin(), 2) == 1);
     assert(*next(m.begin(), 3) == 2);
     assert(*next(m.begin(), 4) == 2);
     assert(*next(m.begin(), 5) == 2);
     assert(*next(m.begin(), 6) == 3);
     assert(*next(m.begin(), 7) == 3);
     assert(*next(m.begin(), 8) == 3);
+    }
 #if _LIBCPP_STD_VER > 11
     {
     typedef int V;
     V ar[] =
     {
         1,
         1,
         1,

test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp

 #include <cassert>
 
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 
 int main()
 {
+    {
     typedef int V;
     V ar[] =
     {
         1,
         1,
         1,
         2,
         2,
std::set<V, C, A> m(input_iterator<const V*>(ar),
                         C(5), A(7));
     assert(m.value_comp() == C(5));
     assert(m.get_allocator() == A(7));
     assert(m.size() == 3);
     assert(distance(m.begin(), m.end()) == 3);
     assert(*m.begin() == 1);
     assert(*next(m.begin()) == 2);
     assert(*next(m.begin(), 2) == 3);
+    }
 #if _LIBCPP_STD_VER > 11
     {
     typedef int V;
     V ar[] =
     {
         1,
         1,
         1,

test/std/utilities/memory/unique.ptr/unique.ptr.single/pointer_type.pass.cpp

int main()
     {
     typedef std::unique_ptr<int, Deleter> P;
     static_assert((std::is_same<P::pointer, Deleter::pointer>::value), "");
     }
 #if TEST_STD_VER >= 11
     {
     typedef std::unique_ptr<int, D2> P;
     static_assert(std::is_same<P::pointer, int*>::value, "");
-
+    }
     {
     typedef std::unique_ptr<int, D3> P;
     static_assert(std::is_same<P::pointer, int*>::value, "");
-    }}
+    }
 #endif
 }