diff options
author | Howard Hinnant <hhinnant@apple.com> | 2013-06-19 21:29:40 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2013-06-19 21:29:40 +0000 |
commit | 07d3eccd26a600a6cad3bb6807880f46a76f269e (patch) | |
tree | 8f9a3056982d04fbb15a89146326e7a7834aabe5 /libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp | |
parent | 64f440518b3dc41da99ace80d9289bfa8d92aa15 (diff) | |
download | bcm5719-llvm-07d3eccd26a600a6cad3bb6807880f46a76f269e.tar.gz bcm5719-llvm-07d3eccd26a600a6cad3bb6807880f46a76f269e.zip |
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
llvm-svn: 184358
Diffstat (limited to 'libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp')
-rw-r--r-- | libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp index 620c0159033..e84a82b609a 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp @@ -18,6 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" +#include "../../../min_allocator.h" int main() { @@ -51,5 +52,36 @@ int main() assert(r->first == 3); assert(r->second == 3); } +#if __cplusplus >= 201103L + { + typedef std::map<int, MoveOnly, std::less<int>, min_allocator<std::pair<const int, MoveOnly>>> M; + typedef std::pair<int, MoveOnly> P; + typedef M::iterator R; + M m; + R r = m.insert(m.end(), P(2, 2)); + assert(r == m.begin()); + assert(m.size() == 1); + assert(r->first == 2); + assert(r->second == 2); + + r = m.insert(m.end(), P(1, 1)); + assert(r == m.begin()); + assert(m.size() == 2); + assert(r->first == 1); + assert(r->second == 1); + + r = m.insert(m.end(), P(3, 3)); + assert(r == prev(m.end())); + assert(m.size() == 3); + assert(r->first == 3); + assert(r->second == 3); + + r = m.insert(m.end(), P(3, 3)); + assert(r == prev(m.end())); + assert(m.size() == 3); + assert(r->first == 3); + assert(r->second == 3); + } +#endif #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } |