From f519be343b3c30af4afde418e390e1e05d3253f8 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 3 Mar 2014 19:20:40 +0000 Subject: Implement LWG 2324: Insert iterator constructors should use addressof(). Add two new container classes to the test suite that overload operator &, and add test cases to the insert/front_insert/back_insert iterator tests that use these containers. llvm-svn: 202741 --- libcxx/include/iterator | 6 +- .../back.insert.iter.cons/container.pass.cpp | 2 + .../back.insert.iter.op++/post.pass.cpp | 2 + .../back.insert.iter.op++/pre.pass.cpp | 2 + .../back.insert.iter.op_astrk/test.pass.cpp | 2 + .../back.inserter/test.pass.cpp | 2 + .../front.insert.iter.cons/container.pass.cpp | 2 + .../front.insert.iter.op++/post.pass.cpp | 2 + .../front.insert.iter.op++/pre.pass.cpp | 2 + .../front.insert.iter.op=/lv_value.pass.cpp | 2 + .../front.insert.iter.op_astrk/test.pass.cpp | 2 + .../front.inserter/test.pass.cpp | 2 + .../insert.iter.ops/insert.iter.cons/test.pass.cpp | 2 + .../insert.iter.ops/insert.iter.op++/post.pass.cpp | 2 + .../insert.iter.ops/insert.iter.op++/pre.pass.cpp | 2 + .../insert.iter.op=/lv_value.pass.cpp | 21 ++ .../insert.iter.op=/rv_value.pass.cpp | 2 + .../insert.iter.op_astrk/test.pass.cpp | 2 + .../insert.iter.ops/inserter/test.pass.cpp | 2 + libcxx/test/support/nasty_containers.hpp | 282 +++++++++++++++++++++ libcxx/www/cxx1y_status.html | 4 +- 21 files changed, 342 insertions(+), 5 deletions(-) create mode 100644 libcxx/test/support/nasty_containers.hpp (limited to 'libcxx') diff --git a/libcxx/include/iterator b/libcxx/include/iterator index 7bfd0498b32..5aa784f2e61 100644 --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -657,7 +657,7 @@ protected: public: typedef _Container container_type; - _LIBCPP_INLINE_VISIBILITY explicit back_insert_iterator(_Container& __x) : container(&__x) {} + _LIBCPP_INLINE_VISIBILITY explicit back_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {} _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator=(const typename _Container::value_type& __value_) {container->push_back(__value_); return *this;} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES @@ -690,7 +690,7 @@ protected: public: typedef _Container container_type; - _LIBCPP_INLINE_VISIBILITY explicit front_insert_iterator(_Container& __x) : container(&__x) {} + _LIBCPP_INLINE_VISIBILITY explicit front_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {} _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator=(const typename _Container::value_type& __value_) {container->push_front(__value_); return *this;} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES @@ -725,7 +725,7 @@ public: typedef _Container container_type; _LIBCPP_INLINE_VISIBILITY insert_iterator(_Container& __x, typename _Container::iterator __i) - : container(&__x), iter(__i) {} + : container(_VSTD::addressof(__x)), iter(__i) {} _LIBCPP_INLINE_VISIBILITY insert_iterator& operator=(const typename _Container::value_type& __value_) {iter = container->insert(iter, __value_); ++iter; return *this;} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp index e9238f6b5a1..f280adb7351 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp @@ -15,6 +15,7 @@ #include #include +#include "nasty_containers.hpp" template void @@ -26,4 +27,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp index e73fa3262d1..c6ff0473ffb 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -31,4 +32,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp index 7fa229bfe09..2b9f245a05a 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -29,4 +30,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp index d7640178622..f50f309e691 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -29,4 +30,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp index 35ba23707c8..30e41407e6a 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -30,4 +31,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp index dad1af804fe..1a148e613cb 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp @@ -15,6 +15,7 @@ #include #include +#include "nasty_containers.hpp" template void @@ -26,4 +27,5 @@ test(C c) int main() { test(std::list()); + test(nasty_list()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp index dc77533dd64..74892272e24 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -31,4 +32,5 @@ test(C c) int main() { test(std::list()); + test(nasty_list()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp index ac54304b6fe..e6d6c07604e 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -29,4 +30,5 @@ test(C c) int main() { test(std::list()); + test(nasty_list()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp index c7ec844534c..cdca9bf4bec 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp @@ -17,6 +17,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -42,4 +43,5 @@ public: int main() { test(std::list()); + test(nasty_list()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp index b24a8f49929..1ff49dde451 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -29,4 +30,5 @@ test(C c) int main() { test(std::list()); + test(nasty_list()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp index 4f3742f62f2..c18f84baf5f 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -30,4 +31,5 @@ test(C c) int main() { test(std::list()); + test(nasty_list()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp index cd2c8a31fac..9f17240a72b 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp @@ -15,6 +15,7 @@ #include #include +#include "nasty_containers.hpp" template void @@ -26,4 +27,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp index 94d97be9109..7d81a7b721d 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -31,4 +32,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp index 373a0b86007..08e6ced01c6 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -29,4 +30,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp index db838e5856a..01eb35efc67 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp @@ -18,6 +18,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -45,6 +46,7 @@ insert3at(C& c, typename C::iterator i, int main() { + { typedef std::vector C; C c1; for (int i = 0; i < 3; ++i) @@ -61,4 +63,23 @@ int main() c2 = c1; insert3at(c2, c2.begin()+3, 'a', 'b', 'c'); test(c1, 3, 'a', 'b', 'c', c2); + } + { + typedef nasty_vector C; + C c1; + for (int i = 0; i < 3; ++i) + c1.push_back(i); + C c2 = c1; + insert3at(c2, c2.begin(), 'a', 'b', 'c'); + test(c1, 0, 'a', 'b', 'c', c2); + c2 = c1; + insert3at(c2, c2.begin()+1, 'a', 'b', 'c'); + test(c1, 1, 'a', 'b', 'c', c2); + c2 = c1; + insert3at(c2, c2.begin()+2, 'a', 'b', 'c'); + test(c1, 2, 'a', 'b', 'c', c2); + c2 = c1; + insert3at(c2, c2.begin()+3, 'a', 'b', 'c'); + test(c1, 3, 'a', 'b', 'c', c2); + } } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp index 36d85b07f4b..2033683b9a9 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp @@ -56,6 +56,7 @@ struct do_nothing int main() { #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES + { typedef std::unique_ptr Ptr; typedef std::vector C; C c1; @@ -91,5 +92,6 @@ int main() c2.push_back(Ptr(x+i)); insert3at(c2, c2.begin()+3, Ptr(x+3), Ptr(x+4), Ptr(x+5)); test(std::move(c1), 3, Ptr(x+3), Ptr(x+4), Ptr(x+5), c2); + } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp index 29b908e56d5..1a926b5485c 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -29,4 +30,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp index 5707f9d005b..43f28d09bcf 100644 --- a/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "nasty_containers.hpp" template void @@ -30,4 +31,5 @@ test(C c) int main() { test(std::vector()); + test(nasty_vector()); } diff --git a/libcxx/test/support/nasty_containers.hpp b/libcxx/test/support/nasty_containers.hpp new file mode 100644 index 00000000000..5a2e1950542 --- /dev/null +++ b/libcxx/test/support/nasty_containers.hpp @@ -0,0 +1,282 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef NASTY_VECTOR_H +#define NASTY_VECTOR_H + +#include +#include + +template +class nasty_vector +{ +public: + typedef typename std::vector nested_container; + typedef typename nested_container::value_type value_type; + typedef typename nested_container::reference reference; + typedef typename nested_container::const_reference const_reference; + typedef typename nested_container::iterator iterator; + typedef typename nested_container::const_iterator const_iterator; + + typedef typename nested_container::size_type size_type; + typedef typename nested_container::difference_type difference_type; + typedef typename nested_container::pointer pointer; + typedef typename nested_container::const_pointer const_pointer; + + typedef typename nested_container::reverse_iterator reverse_iterator; + typedef typename nested_container::const_reverse_iterator const_reverse_iterator; + + nasty_vector() : v_() {} + explicit nasty_vector(size_type n) : v_(n) {} + nasty_vector(size_type n, const value_type& value) : v_(n, value) {} + template nasty_vector(InputIterator first, InputIterator last) : v_(first, last) {} +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + nasty_vector(std::initializer_list il) : v_(il) {} +#endif + ~nasty_vector() {} + + template + void assign(InputIterator first, InputIterator last) { v_.assign(first, last); } + void assign(size_type n, const value_type& u) { v_.assign(n, u); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + void assign(std::initializer_list il) { v_.assign(il); } +#endif + + iterator begin() _NOEXCEPT { return v_.begin(); } + const_iterator begin() const _NOEXCEPT { return v_.begin(); } + iterator end() _NOEXCEPT { return v_.end(); } + const_iterator end() const _NOEXCEPT { return v_.end(); } + + reverse_iterator rbegin() _NOEXCEPT { return v_.rbegin(); } + const_reverse_iterator rbegin() const _NOEXCEPT { return v_.rbegin(); } + reverse_iterator rend() _NOEXCEPT { return v_.rend(); } + const_reverse_iterator rend() const _NOEXCEPT { return v_.rend(); } + + const_iterator cbegin() const _NOEXCEPT { return v_.cbegin(); } + const_iterator cend() const _NOEXCEPT { return v_.cend(); } + const_reverse_iterator crbegin() const _NOEXCEPT { return v_.crbegin(); } + const_reverse_iterator crend() const _NOEXCEPT { return v_.crend(); } + + size_type size() const _NOEXCEPT { return v_.size(); } + size_type max_size() const _NOEXCEPT { return v_.max_size(); } + size_type capacity() const _NOEXCEPT { return v_.capacity(); } + bool empty() const _NOEXCEPT { return v_.empty(); } + void reserve(size_type n) { v_.reserve(n); }; + void shrink_to_fit() _NOEXCEPT { v_.shrink_to_fit(); } + + reference operator[](size_type n) { return v_[n]; } + const_reference operator[](size_type n) const { return v_[n]; } + reference at(size_type n) { return v_.at(n); } + const_reference at(size_type n) const { return v_.at(n); } + + reference front() { return v_.front(); } + const_reference front() const { return v_.front(); } + reference back() { return v_.back(); } + const_reference back() const { return v_.back(); } + + value_type* data() _NOEXCEPT { return v_.data(); } + const value_type* data() const _NOEXCEPT { return v_.data(); } + + void push_back(const value_type& x) { v_.push_back(x); } +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES + void push_back(value_type&& x) { v_.push_back(std::forward(x)); } +#ifndef _LIBCPP_HAS_NO_VARIADICS + template + void emplace_back(Args&&... args) { v_.emplace_back(std::forward(args)...); } +#endif +#endif + void pop_back() { v_.pop_back(); } + +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES +#ifndef _LIBCPP_HAS_NO_VARIADICS + template iterator emplace(const_iterator pos, Args&&... args) + { return v_.emplace(pos, std::forward(args)...); } +#endif +#endif + + iterator insert(const_iterator pos, const value_type& x) { return v_.insert(pos, x); } +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES + iterator insert(const_iterator pos, value_type&& x) { return v_.insert(pos, std::forward(x)); } +#endif + iterator insert(const_iterator pos, size_type n, const value_type& x) { return v_.insert(pos, n, x); } + template + iterator insert(const_iterator pos, InputIterator first, InputIterator last) + { return v_.insert(pos, first, last); } + +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + iterator insert(const_iterator pos, std::initializer_list il) { return v_.insert(pos, il); } +#endif + + iterator erase(const_iterator pos) { return v_.erase(pos); } + iterator erase(const_iterator first, const_iterator last) { return v_.erase(first, last); } + + void clear() _NOEXCEPT { v_.clear(); } + + void resize(size_type sz) { v_.resize(sz); } + void resize(size_type sz, const value_type& c) { v_.resize(sz, c); } + + void swap(nasty_vector &nv) _NOEXCEPT_(std::__is_nothrow_swappable::value) + { v_.swap(nv.v_); } + + nasty_vector *operator &() { return nullptr; } // nasty + const nasty_vector *operator &() const { return nullptr; } // nasty + + nested_container v_; +}; + +template +bool operator==(const nasty_vector& x, const nasty_vector& y) { return x.v_ == y.v_; } + +template +class nasty_list +{ +public: + + typedef typename std::list nested_container; + typedef typename nested_container::value_type value_type; + typedef typename nested_container::reference reference; + typedef typename nested_container::const_reference const_reference; + typedef typename nested_container::iterator iterator; + typedef typename nested_container::const_iterator const_iterator; + + typedef typename nested_container::size_type size_type; + typedef typename nested_container::difference_type difference_type; + typedef typename nested_container::pointer pointer; + typedef typename nested_container::const_pointer const_pointer; + + typedef typename nested_container::reverse_iterator reverse_iterator; + typedef typename nested_container::const_reverse_iterator const_reverse_iterator; + + nasty_list() : l_() {} + explicit nasty_list(size_type n) : l_(n) {} + nasty_list(size_type n, const value_type& value) : l_(n,value) {} + template + nasty_list(Iter first, Iter last) : l_(first, last) {} +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + nasty_list(std::initializer_list il) : l_(il) {} +#endif + + ~nasty_list() {} + +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + nasty_list& operator=(std::initializer_list il) { l_ = il; return *this; } +#endif + template + void assign(Iter first, Iter last) { l_.assign(first, last); } + void assign(size_type n, const value_type& t) { l_.assign(n, t); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + void assign(std::initializer_list il) { l_.assign(il); } +#endif + + + iterator begin() _NOEXCEPT { return l_.begin(); } + const_iterator begin() const _NOEXCEPT { return l_.begin(); } + iterator end() _NOEXCEPT { return l_.end(); } + const_iterator end() const _NOEXCEPT { return l_.end(); } + + reverse_iterator rbegin() _NOEXCEPT { return l_.rbegin(); } + const_reverse_iterator rbegin() const _NOEXCEPT { return l_.rbegin(); } + reverse_iterator rend() _NOEXCEPT { return l_.rend(); } + const_reverse_iterator rend() const _NOEXCEPT { return l_.rend(); } + + const_iterator cbegin() const _NOEXCEPT { return l_.cbegin(); } + const_iterator cend() const _NOEXCEPT { return l_.cend(); } + const_reverse_iterator crbegin() const _NOEXCEPT { return l_.crbegin(); } + const_reverse_iterator crend() const _NOEXCEPT { return l_.crend(); } + + reference front() { return l_.front(); } + const_reference front() const { return l_.front(); } + reference back() { return l_.back(); } + const_reference back() const { return l_.back(); } + + size_type size() const _NOEXCEPT { return l_.size(); } + size_type max_size() const _NOEXCEPT { return l_.max_size(); } + bool empty() const _NOEXCEPT { return l_.empty(); } + + void push_front(const value_type& x) { l_.push_front(x); } + void push_back(const value_type& x) { l_.push_back(x); } +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES + void push_back(value_type&& x) { l_.push_back(std::forward(x)); } + void push_front(value_type&& x) { l_.push_back(std::forward(x)); } +#ifndef _LIBCPP_HAS_NO_VARIADICS + template + void emplace_back(Args&&... args) { l_.emplace_back(std::forward(args)...); } + template + void emplace_front(Args&&... args) { l_.emplace_front(std::forward(args)...); } +#endif +#endif + void pop_front() { l_.pop_front(); } + void pop_back() { l_.pop_back(); } + +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES +#ifndef _LIBCPP_HAS_NO_VARIADICS + template iterator emplace(const_iterator pos, Args&&... args) + { return l_.emplace(pos, std::forward(args)...); } +#endif +#endif + + iterator insert(const_iterator pos, const value_type& x) { return l_.insert(pos, x); } +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES + iterator insert(const_iterator pos, value_type&& x) { return l_.insert(pos, std::forward(x)); } +#endif + iterator insert(const_iterator pos, size_type n, const value_type& x) { return l_.insert(pos, n, x); } + template + iterator insert(const_iterator pos, InputIterator first, InputIterator last) + { return l_.insert(pos, first, last); } + +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + iterator insert(const_iterator pos, std::initializer_list il) { return l_.insert(pos, il); } +#endif + + iterator erase(const_iterator pos) { return l_.erase(pos); } + iterator erase(const_iterator pos, const_iterator last) { return l_.erase(pos, last); } + + void resize(size_type sz) { l_.resize(); } + void resize(size_type sz, const value_type& c) { l_.resize(c); } + + void swap(nasty_list &nl) _NOEXCEPT_(std::__is_nothrow_swappable::value) + { l_.swap(nl.l_); } + + void clear() _NOEXCEPT { l_.clear(); } + +// void splice(const_iterator position, list& x); +// void splice(const_iterator position, list&& x); +// void splice(const_iterator position, list& x, const_iterator i); +// void splice(const_iterator position, list&& x, const_iterator i); +// void splice(const_iterator position, list& x, const_iterator first, +// const_iterator last); +// void splice(const_iterator position, list&& x, const_iterator first, +// const_iterator last); +// +// void remove(const value_type& value); +// template void remove_if(Pred pred); +// void unique(); +// template +// void unique(BinaryPredicate binary_pred); +// void merge(list& x); +// void merge(list&& x); +// template +// void merge(list& x, Compare comp); +// template +// void merge(list&& x, Compare comp); +// void sort(); +// template +// void sort(Compare comp); +// void reverse() noexcept; + + nasty_list *operator &() { return nullptr; } // nasty + const nasty_list *operator &() const { return nullptr; } // nasty + + nested_container l_; +}; + +template +bool operator==(const nasty_list& x, const nasty_list& y) { return x.l_ == y.l_; } + +#endif diff --git a/libcxx/www/cxx1y_status.html b/libcxx/www/cxx1y_status.html index d1632c50a6f..c5fab5abf24 100644 --- a/libcxx/www/cxx1y_status.html +++ b/libcxx/www/cxx1y_status.html @@ -99,7 +99,7 @@ 3778CWGSized deallocationChicago - 3924LWGDiscouraging rand() in C++14Issaquah + 3924LWGDiscouraging rand() in C++14IssaquahComplete 3887LWGConsistent Metafunction AliasesIssaquahComplete @@ -252,7 +252,7 @@ 2320select_on_container_copy_construction() takes allocators, not containersIssaquahComplete 2322Associative(initializer_list, stuff) constructors are underspecifiedIssaquahComplete 2323vector::resize(n, t)'s specification should be simplifiedIssaquahComplete - 2324Insert iterator constructors should use addressof()Issaquah + 2324Insert iterator constructors should use addressof()IssaquahComplete 2329regex_match()/regex_search() with match_results should forbid temporary stringsIssaquahComplete 2330regex("meow", regex::icase) is technically forbidden but should be permittedIssaquah 2332regex_iterator/regex_token_iterator should forbid temporary regexesIssaquahComplete -- cgit v1.2.3