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.

llvm-svn: 178064

2 files changed, 11 insertions, 0 deletions

diff --git a/libcxx/include/vector b/libcxx/include/vector
index 11d9a1b6d33..a083bfe09df 100644
--- a/libcxx/include/vector
+++ b/libcxx/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/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 8d85fd9396d..b0364058eed 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/libcxx/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
 }