git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix order and types of members in C++17 insert_return_type structs 

PR libstdc++/80761
	* include/bits/node_handle.h (_Node_insert_return): Reorder members.
	(tuple_size, tuple_element): Remove partial specializations.
	* include/bits/stl_tree.h (_Rb_tree::insert_return_type): Use
	const_iterator for std::set.
	* testsuite/23_containers/map/modifiers/extract.cc: New.
	* testsuite/23_containers/set/modifiers/extract.cc: New.
	* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
	* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.

From-SVN: r248062
This commit is contained in:
Jonathan Wakely 2017-05-15 14:47:40 +01:00 committed by Jonathan Wakely
parent 511604823d
commit 85c05b5eec
7 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,15 @@
2017-05-15 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/80761
* include/bits/node_handle.h (_Node_insert_return): Reorder members.
(tuple_size, tuple_element): Remove partial specializations.
* include/bits/stl_tree.h (_Rb_tree::insert_return_type): Use
const_iterator for std::set.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
2017-05-12 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/78939

18
libstdc++-v3/include/bits/node_handle.h
View File

@ -280,8 +280,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Iterator, typename _NodeHandle>
struct _Node_insert_return
{
bool inserted = false;
_Iterator position = _Iterator();
bool inserted = false;
_NodeHandle node;
template<size_t _Idx>
@ -305,22 +305,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
};
template<typename _Iterator, typename _NodeHandle>
struct tuple_size<_Node_insert_return<_Iterator, _NodeHandle>>
: integral_constant<size_t, 3> { };
template<typename _Iterator, typename _NodeHandle>
struct tuple_element<0, _Node_insert_return<_Iterator, _NodeHandle>>
{ using type = bool; };
template<typename _Iterator, typename _NodeHandle>
struct tuple_element<1, _Node_insert_return<_Iterator, _NodeHandle>>
{ using type = _Iterator; };
template<typename _Iterator, typename _NodeHandle>
struct tuple_element<2, _Node_insert_return<_Iterator, _NodeHandle>>
{ using type = _NodeHandle; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std

4
libstdc++-v3/include/bits/stl_tree.h
View File

@ -812,7 +812,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201402L
using node_type = _Node_handle<_Key, _Val, _Node_allocator>;
using insert_return_type = _Node_insert_return<iterator, node_type>;
using insert_return_type = _Node_insert_return<
conditional_t<is_same_v<_Key, _Val>, const_iterator, iterator>,
node_type>;
#endif
pair<_Base_ptr, _Base_ptr>

11
libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc
View File

@ -135,6 +135,17 @@ test03()
static_assert( is_same_v<test_type::node_type, compat_type3::node_type> );
}
void
test04()
{
// Check order of members in insert_return_type
auto [pos, ins, node] = test_type::insert_return_type{};
using std::is_same_v;
static_assert( is_same_v<test_type::iterator, decltype(pos)> );
static_assert( is_same_v<bool, decltype(ins)> );
static_assert( is_same_v<test_type::node_type, decltype(node)> );
}
int
main()
{

11
libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc
View File

@ -126,6 +126,17 @@ test03()
static_assert( is_same_v<test_type::node_type, compat_type3::node_type> );
}
void
test04()
{
// Check order of members in insert_return_type
auto [pos, ins, node] = test_type::insert_return_type{};
using std::is_same_v;
static_assert( is_same_v<test_type::iterator, decltype(pos)> );
static_assert( is_same_v<bool, decltype(ins)> );
static_assert( is_same_v<test_type::node_type, decltype(node)> );
}
int
main()
{

11
libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc
View File

@ -136,6 +136,17 @@ test03()
static_assert( is_same_v<test_type::node_type, compat_type3::node_type> );
}
void
test04()
{
// Check order of members in insert_return_type
auto [pos, ins, node] = test_type::insert_return_type{};
using std::is_same_v;
static_assert( is_same_v<test_type::iterator, decltype(pos)> );
static_assert( is_same_v<bool, decltype(ins)> );
static_assert( is_same_v<test_type::node_type, decltype(node)> );
}
int
main()
{

11
libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc
View File

@ -128,6 +128,17 @@ test03()
static_assert( is_same_v<test_type::node_type, compat_type3::node_type> );
}
void
test04()
{
// Check order of members in insert_return_type
auto [pos, ins, node] = test_type::insert_return_type{};
using std::is_same_v;
static_assert( is_same_v<test_type::iterator, decltype(pos)> );
static_assert( is_same_v<bool, decltype(ins)> );
static_assert( is_same_v<test_type::node_type, decltype(node)> );
}
int
main()
{