generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove use of zero length arrays in tests. Get tests passing with -pedantic-errors

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@228706 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-02-10 16:51:29 +00:00
parent c3231d213a
commit 7f9cc52faf
8 changed files with 58 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/std/containers/associative/map/map.special/member_swap.pass.cpp
View File

@ -19,19 +19,13 @@
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
{
{ {
typedef std::pair<const int, double> V; typedef std::pair<const int, double> V;
{
typedef std::map<int, double> M; typedef std::map<int, double> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -39,9 +33,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -53,7 +44,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -69,11 +60,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -110,17 +98,10 @@ int main()
} }
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
{ {
typedef std::pair<const int, double> V;
typedef std::map<int, double, std::less<int>, min_allocator<V>> M; typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -128,9 +109,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -142,7 +120,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -158,11 +136,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);

43
test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
View File

@ -22,19 +22,13 @@
#include "min_allocator.h" #include "min_allocator.h"
int main() int main()
{
{ {
typedef std::pair<const int, double> V; typedef std::pair<const int, double> V;
{
typedef std::map<int, double> M; typedef std::map<int, double> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -42,9 +36,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -56,7 +47,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -72,11 +63,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -181,17 +169,10 @@ int main()
} }
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
{ {
typedef std::pair<const int, double> V;
typedef std::map<int, double, std::less<int>, min_allocator<V>> M; typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -199,9 +180,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -213,7 +191,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -229,11 +207,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);

40
test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
View File

@ -24,14 +24,8 @@ int main()
{ {
typedef std::multimap<int, double> M; typedef std::multimap<int, double> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -39,9 +33,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -53,7 +44,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -69,11 +60,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -112,14 +100,8 @@ int main()
{ {
typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M; typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -127,9 +109,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -141,7 +120,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -157,11 +136,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);

40
test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
View File

@ -27,14 +27,8 @@ int main()
{ {
typedef std::multimap<int, double> M; typedef std::multimap<int, double> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -42,9 +36,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -56,7 +47,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -72,11 +63,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -183,14 +171,8 @@ int main()
{ {
typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M; typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -198,9 +180,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
V(5, 5), V(5, 5),
@ -212,7 +191,7 @@ int main()
V(11, 11), V(11, 11),
V(12, 12) V(12, 12)
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -228,11 +207,8 @@ int main()
V(3, 3), V(3, 3),
V(4, 4) V(4, 4)
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);

40
test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
View File

@ -24,14 +24,8 @@ int main()
typedef int V; typedef int V;
typedef std::multiset<int> M; typedef std::multiset<int> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -39,9 +33,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
5, 5,
@ -53,7 +44,7 @@ int main()
11, 11,
12 12
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -69,11 +60,8 @@ int main()
3, 3,
4 4
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -113,14 +101,8 @@ int main()
typedef int V; typedef int V;
typedef std::multiset<int, std::less<int>, min_allocator<int>> M; typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -128,9 +110,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
5, 5,
@ -142,7 +121,7 @@ int main()
11, 11,
12 12
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -158,11 +137,8 @@ int main()
3, 3,
4 4
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);

20
test/std/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
View File

@ -23,14 +23,8 @@ int main()
typedef int V; typedef int V;
typedef std::multiset<int> M; typedef std::multiset<int> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -38,9 +32,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
5, 5,
@ -52,7 +43,7 @@ int main()
11, 11,
12 12
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -68,11 +59,8 @@ int main()
3, 3,
4 4
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);

40
test/std/containers/associative/set/set.special/member_swap.pass.cpp
View File

@ -24,14 +24,8 @@ int main()
typedef int V; typedef int V;
typedef std::set<int> M; typedef std::set<int> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -39,9 +33,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
5, 5,
@ -53,7 +44,7 @@ int main()
11, 11,
12 12
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -69,11 +60,8 @@ int main()
3, 3,
4 4
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -113,14 +101,8 @@ int main()
typedef int V; typedef int V;
typedef std::set<int, std::less<int>, min_allocator<int>> M; typedef std::set<int, std::less<int>, min_allocator<int>> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);
@ -128,9 +110,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
5, 5,
@ -142,7 +121,7 @@ int main()
11, 11,
12 12
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -158,11 +137,8 @@ int main()
3, 3,
4 4
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
m1.swap(m2); m1.swap(m2);

20
test/std/containers/associative/set/set.special/non_member_swap.pass.cpp
View File

@ -23,14 +23,8 @@ int main()
typedef int V; typedef int V;
typedef std::set<int> M; typedef std::set<int> M;
{ {
V ar1[] = M m1;
{ M m2;
};
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);
@ -38,9 +32,6 @@ int main()
assert(m2 == m1_save); assert(m2 == m1_save);
} }
{ {
V ar1[] =
{
};
V ar2[] = V ar2[] =
{ {
5, 5,
@ -52,7 +43,7 @@ int main()
11, 11,
12 12
}; };
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1;
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
@ -68,11 +59,8 @@ int main()
3, 3,
4 4
}; };
V ar2[] =
{
};
M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0])); M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0])); M m2;
M m1_save = m1; M m1_save = m1;
M m2_save = m2; M m2_save = m2;
swap(m1, m2); swap(m1, m2);