diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2019-07-08 03:45:28 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2019-07-08 03:45:28 +0000 |
| commit | f814dcbafbabd46a1babaeabec6acc3b70951bf4 (patch) | |
| tree | a570d0e7a2d629cbfd10f422bc0753d7255f9562 /libcxx/include/list | |
| parent | d3bbc06ac79fd1500b40b2a60b262e204ff3dfe3 (diff) | |
| download | bcm5719-llvm-f814dcbafbabd46a1babaeabec6acc3b70951bf4.tar.gz bcm5719-llvm-f814dcbafbabd46a1babaeabec6acc3b70951bf4.zip | |
Make forward_list::remove/remove_if/unique all return void before C++20; undoes that bit of D58332. Thanks to Mikhail Maltsev for pointing this out
llvm-svn: 365290
Diffstat (limited to 'libcxx/include/list')
| -rw-r--r-- | libcxx/include/list | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libcxx/include/list b/libcxx/include/list index 2e80b2ff840..c92ef79282e 100644 --- a/libcxx/include/list +++ b/libcxx/include/list @@ -129,11 +129,12 @@ public: void splice(const_iterator position, list&& x, const_iterator first, const_iterator last); - size_type remove(const value_type& value); // void before C++20 - template <class Pred> size_type remove_if(Pred pred); // void before C++20 - size_type unique(); // void before C++20 + size_type remove(const value_type& value); // void before C++20 + template <class Pred> + size_type remove_if(Pred pred); // void before C++20 + size_type unique(); // void before C++20 template <class BinaryPredicate> - size_type unique(BinaryPredicate binary_pred); // void before C++20 + size_type unique(BinaryPredicate binary_pred); // void before C++20 void merge(list& x); void merge(list&& x); template <class Compare> @@ -858,9 +859,9 @@ public: typedef _VSTD::reverse_iterator<iterator> reverse_iterator; typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator; #if _LIBCPP_STD_VER > 17 - typedef size_type __remove_return_type; + typedef size_type __remove_return_type; #else - typedef void __remove_return_type; + typedef void __remove_return_type; #endif _LIBCPP_INLINE_VISIBILITY |

