[libcxx] [test] Slightly rearrange scopes in order to avoid shadowing M typedefs.

[STL_MSFT]

Summary

Slightly rearrange scopes in order to avoid shadowing M typedefs.

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

[mclow.lists]

Landed as revision 272018

[STL_MSFT]

Marshall checked this one in too, closing.

test/std/containers/associative/map/map.special/non_member_swap.pass.cpp

typedef std::map<int, double> M;
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
     }
+    }
     {
         typedef test_allocator<V> A;
         typedef test_compare<std::less<int> > C;
         typedef std::map<int, double, C, A> M;
         V ar1[] =
         {
             V(1, 1),
             V(2, 2),
typedef std::map<int, double> M;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
         assert(m1.key_comp() == C(2));
         assert(m1.get_allocator() == A(2));
         assert(m2.key_comp() == C(1));
         assert(m2.get_allocator() == A(1));
     }
-    }
 #if __cplusplus >= 201103L
     {
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
     {
         M m1;
         M m2;
         M m1_save = m1;
         M m2_save = m2;
typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
     }
+    }
     {
         typedef min_allocator<V> A;
         typedef test_compare<std::less<int> > C;
         typedef std::map<int, double, C, A> M;
         V ar1[] =
         {
             V(1, 1),
             V(2, 2),
typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
         assert(m1.key_comp() == C(2));
         assert(m1.get_allocator() == A());
         assert(m2.key_comp() == C(1));
         assert(m2.get_allocator() == A());
     }
-    }
 #endif
 }

test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp

typedef std::multimap<int, double> M;
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
     }
+    }
     {
         typedef test_allocator<V> A;
         typedef test_compare<std::less<int> > C;
         typedef std::multimap<int, double, C, A> M;
         V ar1[] =
         {
             V(1, 1),
             V(2, 2),
typedef std::multimap<int, double> M;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
         assert(m1.key_comp() == C(2));
         assert(m1.get_allocator() == A(2));
         assert(m2.key_comp() == C(1));
         assert(m2.get_allocator() == A(1));
     }
-    }
 #if __cplusplus >= 201103L
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {
         M m1;
         M m2;
         M m1_save = m1;
         M m2_save = m2;
typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
     }
+    }
     {
         typedef min_allocator<V> A;
         typedef test_compare<std::less<int> > C;
         typedef std::multimap<int, double, C, A> M;
         V ar1[] =
         {
             V(1, 1),
             V(2, 2),
typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
         assert(m1.key_comp() == C(2));
         assert(m1.get_allocator() == A());
         assert(m2.key_comp() == C(1));
         assert(m2.get_allocator() == A());
     }
-    }
 #endif
 }

test/std/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp

 #include <set>
 #include <cassert>
 #include "test_allocator.h"
 #include "../../../test_compare.h"
 
 int main()
 {
     typedef int V;
+    {
     typedef std::multiset<int> M;
     {
         M m1;
         M m2;
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
typedef std::multiset<int> M;
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
     }
+    }
     {
         typedef test_allocator<V> A;
         typedef test_compare<std::less<int> > C;
         typedef std::set<int, C, A> M;
         V ar1[] =
         {
             1,
             2,

test/std/containers/associative/set/set.special/non_member_swap.pass.cpp

 #include <set>
 #include <cassert>
 #include "test_allocator.h"
 #include "../../../test_compare.h"
 
 int main()
 {
     typedef int V;
+    {
     typedef std::set<int> M;
     {
         M m1;
         M m2;
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
typedef std::set<int> M;
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
         swap(m1, m2);
         assert(m1 == m2_save);
         assert(m2 == m1_save);
     }
+    }
     {
         typedef test_allocator<V> A;
         typedef test_compare<std::less<int> > C;
         typedef std::set<int, C, A> M;
         V ar1[] =
         {
             1,
             2,