mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-06 23:25:24 +02:00
This is final piece of P1206R7, adding a feature test macros, as range constructors and member operations are now implemented for all containers and adaptors. For consistency with the proposal, all new container operations and helpers are now defined if __glibcxx_containers_ranges, instead of __glibcxx_ranges_to_container. PR libstdc++/111055 libstdc++-v3/ChangeLog: * include/bits/version.def (containers_ranges): Define. * include/bits/version.h: Regenerate. * include/bits/ranges_base.h (__detail::__container_compatible_range) (__detail::__range_to_alloc_type, __detail::__range_mapped_type) (__detail::__range_key_type): Depend on __glibcxx_containers_ranges instead of __glibcxx_ranges_to_container. * include/bits/basic_string.h: Replace __glibcxx_ranges_to_container with __glibcxx_containers_ranges. * include/bits/cow_string.h: Likewise. * include/bits/deque.tcc: Likewise. * include/bits/forward_list.h: Likewise. * include/bits/stl_bvector.h: Likewise. * include/bits/stl_deque.h: Likewise. * include/bits/stl_list.h: Likewise. * include/bits/stl_map.h: Likewise. * include/bits/stl_multimap.h: Likewise. * include/bits/stl_multiset.h: Likewise. * include/bits/stl_queue.h: Likewise. * include/bits/stl_set.h: Likewise. * include/bits/stl_stack.h: Likewise. * include/bits/stl_vector.h: Likewise. * include/bits/unordered_map.h: Likewise. * include/bits/unordered_set.h: Likewise. * include/bits/vector.tcc: Likewise. * include/debug/deque: Likewise. * include/debug/forward_list: Likewise. * include/debug/list: Likewise. * include/debug/map.h: Likewise. * include/debug/multimap.h: Likewise. * include/debug/multiset.h: Likewise. * include/debug/set.h: Likewise. * include/debug/unordered_map: Likewise. * include/debug/unordered_set: Likewise. * include/debug/vector: Likewise. * include/std/deque: Provide __cpp_lib_containers_ranges. * include/std/forward_list: Likewise. * include/std/list: Likewise. * include/std/map: Likewise. * include/std/queue: Likewise. * include/std/set: Likewise. * include/std/stack: Likewise. * include/std/string: Likewise. * include/std/unordered_map: Likewise. * include/std/unordered_set: Likewise. * include/std/vector: Likewise. * testsuite/21_strings/basic_string/cons/from_range.cc: Test for value __cpp_lib_containers_ranges. * testsuite/23_containers/deque/cons/from_range.cc: Likewise. * testsuite/23_containers/forward_list/cons/from_range.cc: Likewise. * testsuite/23_containers/list/cons/from_range.cc: Likewise. * testsuite/23_containers/map/cons/from_range.cc: Likewise. * testsuite/23_containers/multimap/cons/from_range.cc: Likewise. * testsuite/23_containers/multiset/cons/from_range.cc: Likewise. * testsuite/23_containers/priority_queue/cons_from_range.cc: Likewise. * testsuite/23_containers/queue/cons_from_range.cc: Likewise. * testsuite/23_containers/set/cons/from_range.cc: Likewise. * testsuite/23_containers/stack/cons_from_range.cc: Likewise. * testsuite/23_containers/unordered_map/cons/from_range.cc: Likewise. * testsuite/23_containers/unordered_multimap/cons/from_range.cc: Likewise. * testsuite/23_containers/unordered_multiset/cons/from_range.cc: Likewise. * testsuite/23_containers/unordered_set/cons/from_range.cc: Likewise. * testsuite/23_containers/vector/bool/cons/from_range.cc: Likewise. * testsuite/23_containers/vector/cons/from_range.cc: Likewise. Reviewed-by: Jonathan Wakely <jwakely@redhat.com> Signed-off-by: Tomasz Kamiński <tkaminsk@redhat.com>
131 lines
4.4 KiB
C++
131 lines
4.4 KiB
C++
// Components for manipulating sequences of characters -*- C++ -*-
|
|
|
|
// Copyright (C) 1997-2025 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file include/string
|
|
* This is a Standard C++ Library header.
|
|
*/
|
|
|
|
//
|
|
// ISO C++ 14882: 21 Strings library
|
|
//
|
|
|
|
#ifndef _GLIBCXX_STRING
|
|
#define _GLIBCXX_STRING 1
|
|
|
|
#ifdef _GLIBCXX_SYSHDR
|
|
#pragma GCC system_header
|
|
#endif
|
|
|
|
#include <bits/requires_hosted.h> // containers
|
|
|
|
#include <bits/c++config.h>
|
|
#include <bits/stringfwd.h>
|
|
#include <bits/char_traits.h>
|
|
#include <bits/allocator.h>
|
|
#include <bits/cpp_type_traits.h>
|
|
#include <bits/localefwd.h> // For operators >>, <<, and getline.
|
|
#include <bits/ostream_insert.h>
|
|
#include <bits/stl_iterator_base_funcs.h>
|
|
#include <bits/stl_iterator.h>
|
|
#include <bits/stl_function.h> // For less
|
|
#include <ext/numeric_traits.h>
|
|
#include <bits/stl_algobase.h>
|
|
#include <bits/refwrap.h>
|
|
#include <bits/range_access.h>
|
|
#include <bits/basic_string.h>
|
|
#include <bits/basic_string.tcc>
|
|
|
|
#define __glibcxx_want_algorithm_default_value_type
|
|
#define __glibcxx_want_allocator_traits_is_always_equal
|
|
#define __glibcxx_want_constexpr_char_traits
|
|
#define __glibcxx_want_constexpr_string
|
|
#define __glibcxx_want_containers_ranges
|
|
#define __glibcxx_want_erase_if
|
|
#define __glibcxx_want_nonmember_container_access
|
|
#define __glibcxx_want_string_resize_and_overwrite
|
|
#define __glibcxx_want_string_udls
|
|
#define __glibcxx_want_to_string
|
|
#include <bits/version.h>
|
|
|
|
#if __cplusplus >= 201703L && _GLIBCXX_USE_CXX11_ABI
|
|
#include <bits/memory_resource.h>
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
namespace pmr {
|
|
template<typename _CharT, typename _Traits = char_traits<_CharT>>
|
|
using basic_string = std::basic_string<_CharT, _Traits,
|
|
polymorphic_allocator<_CharT>>;
|
|
using string = basic_string<char>;
|
|
#ifdef _GLIBCXX_USE_CHAR8_T
|
|
using u8string = basic_string<char8_t>;
|
|
#endif
|
|
using u16string = basic_string<char16_t>;
|
|
using u32string = basic_string<char32_t>;
|
|
using wstring = basic_string<wchar_t>;
|
|
} // namespace pmr
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // C++17
|
|
|
|
#ifdef __cpp_lib_erase_if // C++ >= 20 && HOSTED
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
typename _Predicate>
|
|
_GLIBCXX20_CONSTEXPR
|
|
inline typename basic_string<_CharT, _Traits, _Alloc>::size_type
|
|
erase_if(basic_string<_CharT, _Traits, _Alloc>& __cont, _Predicate __pred)
|
|
{
|
|
using namespace __gnu_cxx;
|
|
const auto __osz = __cont.size();
|
|
const auto __end = __cont.end();
|
|
auto __removed = std::__remove_if(__cont.begin(), __end,
|
|
__ops::__pred_iter(std::ref(__pred)));
|
|
__cont.erase(__removed, __end);
|
|
return __osz - __cont.size();
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
typename _Up _GLIBCXX26_DEF_VAL_T(_CharT)>
|
|
_GLIBCXX20_CONSTEXPR
|
|
inline typename basic_string<_CharT, _Traits, _Alloc>::size_type
|
|
erase(basic_string<_CharT, _Traits, _Alloc>& __cont, const _Up& __value)
|
|
{
|
|
using namespace __gnu_cxx;
|
|
const auto __osz = __cont.size();
|
|
const auto __end = __cont.end();
|
|
auto __removed = std::__remove_if(__cont.begin(), __end,
|
|
__ops::__iter_equals_val(__value));
|
|
__cont.erase(__removed, __end);
|
|
return __osz - __cont.size();
|
|
}
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // __cpp_lib_erase_if
|
|
|
|
#endif /* _GLIBCXX_STRING */
|