From 02d5e18917a9dc1df45d29e172859099cb261ad0 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 26 Mar 2013 19:04:56 +0000
Subject: [PATCH] Another vector debug mode test, and a static test on
Allocator::value_type. This partially addresses
http://llvm.org/bugs/show_bug.cgi?id=15576.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@178064 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/vector | 3 +++
.../containers/sequences/vector/vector.cons/move.pass.cpp | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/include/vector b/include/vector
index 11d9a1b6..a083bfe0 100644
--- a/include/vector
+++ b/include/vector
@@ -502,6 +502,9 @@ public:
typedef _VSTD::reverse_iterator<iterator> reverse_iterator;
typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
+ static_assert((is_same<typename allocator_type::value_type, value_type>::value),
+ "Allocator::value_type must be same type as value_type");
+
_LIBCPP_INLINE_VISIBILITY
vector()
_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
diff --git a/test/containers/sequences/vector/vector.cons/move.pass.cpp b/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 8d85fd93..b0364058 100644
--- a/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move.pass.cpp
@@ -45,5 +45,13 @@ int main()
assert(l.empty());
assert(l2.get_allocator() == lo.get_allocator());
}
+ {
+ int a1[] = {1, 3, 7, 9, 10};
+ std::vector<int> c1(a1, a1+sizeof(a1)/sizeof(a1[0]));
+ std::vector<int>::const_iterator i = c1.begin();
+ std::vector<int> c2 = std::move(c1);
+ std::vector<int>::iterator j = c2.erase(i);
+ assert(*j == 3);
+ }
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}