diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2018-11-30 16:12:13 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2018-11-30 16:12:13 +0000 |
| commit | 0b44b4b807a2d7bee4d2a0e4c37794db2aeeb44f (patch) | |
| tree | f98bd7fce12f723b38ecedc523dcb4ccfc3763ec /libstdc++-v3/testsuite/21_strings | |
| parent | ef33afebf3351fe9f5032ebb735f4ec988e29f06 (diff) | |
| download | gcc-0b44b4b807a2d7bee4d2a0e4c37794db2aeeb44f.zip gcc-0b44b4b807a2d7bee4d2a0e4c37794db2aeeb44f.tar.gz gcc-0b44b4b807a2d7bee4d2a0e4c37794db2aeeb44f.tar.bz2 | |
Pre-emptively support P0646R1 for std container erasure.
2018-11-30 Edward Smith-Rowland <3dw4rd@verizon.net>
Pre-emptively support P0646R1 for std container erasure.
* include/bits/erase_if.h: Accumulate and return number of erased nodes.
* include/std/forward_list (): Return number of erased items.
* include/std/list (): Ditto.
* include/std/map (): Ditto.
* include/std/set (): Ditto.
* include/std/string (): Ditto.
* include/std/unordered_map (): Ditto.
* include/std/unordered_set (): Ditto.
* include/std/vector (): Ditto.
* testsuite/21_strings/basic_string/erasure.cc: Test number of erasures.
* testsuite/23_containers/deque/erasure.cc: Ditto.
* testsuite/23_containers/forward_list/erasure.cc: Ditto.
* testsuite/23_containers/list/erasure.cc: Ditto.
* testsuite/23_containers/map/erasure.cc: Ditto.
* testsuite/23_containers/set/erasure.cc: Ditto.
* testsuite/23_containers/unordered_map/erasure.cc: Ditto.
* testsuite/23_containers/unordered_set/erasure.cc: Ditto.
* testsuite/23_containers/vector/erasure.cc: Ditto.
From-SVN: r266672
Diffstat (limited to 'libstdc++-v3/testsuite/21_strings')
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc index d8ac6a4..2e92827 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc @@ -30,18 +30,21 @@ test01() }; std::string str("cute fluffy kittens"); - std::erase_if(str, is_vowel); + auto num = std::erase_if(str, is_vowel); VERIFY( str == "ct flffy kttns" ); + VERIFY( num == 5 ); } void test02() { std::string str = "cute fluffy kittens"; - std::erase(str, 'f'); + auto num = std::erase(str, 'f'); VERIFY( str == "cute luy kittens" ); - std::erase(str, 'z'); + VERIFY( num == 3 ); + num = std::erase(str, 'z'); VERIFY( str == "cute luy kittens" ); + VERIFY( num == 0 ); } int |