Implement full support for non-pointer types in custom allocators. This is for the associative containers only. This work still needs to be done on the unordered and sequence containers. Fixes http://llvm.org/bugs/show_bug.cgi?id=15978
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@184358 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -17,8 +17,11 @@
|
||||
#include <set>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../min_allocator.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
{
|
||||
typedef int V;
|
||||
typedef std::set<int> M;
|
||||
{
|
||||
@@ -119,4 +122,109 @@ int main()
|
||||
r = m.lower_bound(20);
|
||||
assert(r == next(m.begin(), 8));
|
||||
}
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
{
|
||||
typedef int V;
|
||||
typedef std::set<int, std::less<int>, min_allocator<int>> M;
|
||||
{
|
||||
typedef M::iterator R;
|
||||
V ar[] =
|
||||
{
|
||||
5,
|
||||
7,
|
||||
9,
|
||||
11,
|
||||
13,
|
||||
15,
|
||||
17,
|
||||
19
|
||||
};
|
||||
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
|
||||
R r = m.lower_bound(5);
|
||||
assert(r == m.begin());
|
||||
r = m.lower_bound(7);
|
||||
assert(r == next(m.begin()));
|
||||
r = m.lower_bound(9);
|
||||
assert(r == next(m.begin(), 2));
|
||||
r = m.lower_bound(11);
|
||||
assert(r == next(m.begin(), 3));
|
||||
r = m.lower_bound(13);
|
||||
assert(r == next(m.begin(), 4));
|
||||
r = m.lower_bound(15);
|
||||
assert(r == next(m.begin(), 5));
|
||||
r = m.lower_bound(17);
|
||||
assert(r == next(m.begin(), 6));
|
||||
r = m.lower_bound(19);
|
||||
assert(r == next(m.begin(), 7));
|
||||
r = m.lower_bound(4);
|
||||
assert(r == next(m.begin(), 0));
|
||||
r = m.lower_bound(6);
|
||||
assert(r == next(m.begin(), 1));
|
||||
r = m.lower_bound(8);
|
||||
assert(r == next(m.begin(), 2));
|
||||
r = m.lower_bound(10);
|
||||
assert(r == next(m.begin(), 3));
|
||||
r = m.lower_bound(12);
|
||||
assert(r == next(m.begin(), 4));
|
||||
r = m.lower_bound(14);
|
||||
assert(r == next(m.begin(), 5));
|
||||
r = m.lower_bound(16);
|
||||
assert(r == next(m.begin(), 6));
|
||||
r = m.lower_bound(18);
|
||||
assert(r == next(m.begin(), 7));
|
||||
r = m.lower_bound(20);
|
||||
assert(r == next(m.begin(), 8));
|
||||
}
|
||||
{
|
||||
typedef M::const_iterator R;
|
||||
V ar[] =
|
||||
{
|
||||
5,
|
||||
7,
|
||||
9,
|
||||
11,
|
||||
13,
|
||||
15,
|
||||
17,
|
||||
19
|
||||
};
|
||||
const M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
|
||||
R r = m.lower_bound(5);
|
||||
assert(r == m.begin());
|
||||
r = m.lower_bound(7);
|
||||
assert(r == next(m.begin()));
|
||||
r = m.lower_bound(9);
|
||||
assert(r == next(m.begin(), 2));
|
||||
r = m.lower_bound(11);
|
||||
assert(r == next(m.begin(), 3));
|
||||
r = m.lower_bound(13);
|
||||
assert(r == next(m.begin(), 4));
|
||||
r = m.lower_bound(15);
|
||||
assert(r == next(m.begin(), 5));
|
||||
r = m.lower_bound(17);
|
||||
assert(r == next(m.begin(), 6));
|
||||
r = m.lower_bound(19);
|
||||
assert(r == next(m.begin(), 7));
|
||||
r = m.lower_bound(4);
|
||||
assert(r == next(m.begin(), 0));
|
||||
r = m.lower_bound(6);
|
||||
assert(r == next(m.begin(), 1));
|
||||
r = m.lower_bound(8);
|
||||
assert(r == next(m.begin(), 2));
|
||||
r = m.lower_bound(10);
|
||||
assert(r == next(m.begin(), 3));
|
||||
r = m.lower_bound(12);
|
||||
assert(r == next(m.begin(), 4));
|
||||
r = m.lower_bound(14);
|
||||
assert(r == next(m.begin(), 5));
|
||||
r = m.lower_bound(16);
|
||||
assert(r == next(m.begin(), 6));
|
||||
r = m.lower_bound(18);
|
||||
assert(r == next(m.begin(), 7));
|
||||
r = m.lower_bound(20);
|
||||
assert(r == next(m.begin(), 8));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user