OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add assertions to extract(const_iterator) functions 

* include/bits/stl_map.h (map::extract(const_iterator)): Assert that
	iterator is not past-the-end.
	* include/bits/stl_multimap.h (multimap::extract(const_iterator)):
	Likewise.
	* include/bits/stl_multiset.h (multiset::extract(const_iterator)):
	Likewise.
	* include/bits/stl_set.h (set::extract(const_iterator)): Likewise.
	* include/bits/unordered_map.h (unordered_map::extract(const_iterator))
	(unordered_multimap::extract(const_iterator)): Likewise.
	* include/bits/unordered_set.h (unordered_set::extract(const_iterator))
	(unordered_multiset::extract(const_iterator)): Likewise.

From-SVN: r240487
This commit is contained in:
Jonathan Wakely 2016-09-26 11:17:48 +01:00 committed by Jonathan Wakely
parent a38814c003
commit 976160b962
7 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,17 @@
2016-09-26 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_map.h (map::extract(const_iterator)): Assert that
iterator is not past-the-end.
* include/bits/stl_multimap.h (multimap::extract(const_iterator)):
Likewise.
* include/bits/stl_multiset.h (multiset::extract(const_iterator)):
Likewise.
* include/bits/stl_set.h (set::extract(const_iterator)): Likewise.
* include/bits/unordered_map.h (unordered_map::extract(const_iterator))
(unordered_multimap::extract(const_iterator)): Likewise.
* include/bits/unordered_set.h (unordered_set::extract(const_iterator))
(unordered_multiset::extract(const_iterator)): Likewise.
2016-09-26 Ville Voutilainen <ville.voutilainen@gmail.com>
PR libstdc++/77717

5
libstdc++-v3/include/bits/stl_map.h
View File

@ -605,7 +605,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_t.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_t.extract(__pos);
}
/// Extract a node.
node_type

5
libstdc++-v3/include/bits/stl_multimap.h
View File

@ -606,7 +606,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_t.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_t.extract(__pos);
}
/// Extract a node.
node_type

5
libstdc++-v3/include/bits/stl_multiset.h
View File

@ -549,7 +549,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_t.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_t.extract(__pos);
}
/// Extract a node.
node_type

5
libstdc++-v3/include/bits/stl_set.h
View File

@ -565,7 +565,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_t.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_t.extract(__pos);
}
/// Extract a node.
node_type

10
libstdc++-v3/include/bits/unordered_map.h
View File

@ -421,7 +421,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_h.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_h.extract(__pos);
}
/// Extract a node.
node_type
@ -1534,7 +1537,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_h.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_h.extract(__pos);
}
/// Extract a node.
node_type

10
libstdc++-v3/include/bits/unordered_set.h
View File

@ -482,7 +482,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_h.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_h.extract(__pos);
}
/// Extract a node.
node_type
@ -1190,7 +1193,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Extract a node.
node_type
extract(const_iterator __pos)
{ return _M_h.extract(__pos); }
{
__glibcxx_assert(__pos != end());
return _M_h.extract(__pos);
}
/// Extract a node.
node_type