procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try_emplace and insert_or_assign for Debug Mode.

Browse source 
* include/debug/map.h (map::try_emplace, map::insert_or_assign):
	Define.
	* include/debug/unordered_map (unordered_map::try_emplace,
	unordered_map::insert_or_assign): Define.

From-SVN: r227229
This commit is contained in:
Jonathan Wakely 2015-08-26 21:58:14 +01:00 • committed by Jonathan Wakely
parent e41fd1f067
commit 66c182be12
3 changed files with 170 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View file

@ -1,5 +1,10 @@
2015-08-26 Jonathan Wakely <jwakely@redhat.com>
* include/debug/map.h (map::try_emplace, map::insert_or_assign):
Define.
* include/debug/unordered_map (unordered_map::try_emplace,
unordered_map::insert_or_assign): Define.
PR libstdc++/66902
* src/c++11/debug.cc (_S_debug_messages): Give internal linkage.

83
libstdc++-v3/include/debug/map.h
View file

@ -317,6 +317,89 @@ namespace __debug
_Base::insert(__first, __last);
}
#if __cplusplus > 201402L
template <typename... _Args>
pair<iterator, bool>
try_emplace(const key_type& __k, _Args&&... __args)
{
auto __res = _Base::try_emplace(__k,
std::forward<_Args>(__args)...);
return { iterator(__res.first, this), __res.second };
}
template <typename... _Args>
pair<iterator, bool>
try_emplace(key_type&& __k, _Args&&... __args)
{
auto __res = _Base::try_emplace(std::move(__k),
std::forward<_Args>(__args)...);
return { iterator(__res.first, this), __res.second };
}
template <typename... _Args>
iterator
try_emplace(const_iterator __hint, const key_type& __k,
_Args&&... __args)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::try_emplace(__hint.base(), __k,
std::forward<_Args>(__args)...),
this);
}
template <typename... _Args>
iterator
try_emplace(const_iterator __hint, key_type&& __k, _Args&&... __args)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::try_emplace(__hint.base(), std::move(__k),
std::forward<_Args>(__args)...),
this);
}
template <typename _Obj>
std::pair<iterator, bool>
insert_or_assign(const key_type& __k, _Obj&& __obj)
{
auto __res = _Base::insert_or_assign(__k,
std::forward<_Obj>(__obj));
return { iterator(__res.first, this), __res.second };
}
template <typename _Obj>
std::pair<iterator, bool>
insert_or_assign(key_type&& __k, _Obj&& __obj)
{
auto __res = _Base::insert_or_assign(std::move(__k),
std::forward<_Obj>(__obj));
return { iterator(__res.first, this), __res.second };
}
template <typename _Obj>
iterator
insert_or_assign(const_iterator __hint,
const key_type& __k, _Obj&& __obj)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::insert_or_assign(__hint.base(), __k,
std::forward<_Obj>(__obj)),
this);
}
template <typename _Obj>
iterator
insert_or_assign(const_iterator __hint, key_type&& __k, _Obj&& __obj)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::insert_or_assign(__hint.base(),
std::move(__k),
std::forward<_Obj>(__obj)),
this);
}
#endif
#if __cplusplus >= 201103L
iterator
erase(const_iterator __position)

82
libstdc++-v3/include/debug/unordered_map
View file

@ -377,6 +377,88 @@ namespace __debug
_M_check_rehashed(__bucket_count);
}
#if __cplusplus > 201402L
template <typename... _Args>
pair<iterator, bool>
try_emplace(const key_type& __k, _Args&&... __args)
{
auto __res = _Base::try_emplace(__k,
std::forward<_Args>(__args)...);
return { iterator(__res.first, this), __res.second };
}
template <typename... _Args>
pair<iterator, bool>
try_emplace(key_type&& __k, _Args&&... __args)
{
auto __res = _Base::try_emplace(std::move(__k),
std::forward<_Args>(__args)...);
return { iterator(__res.first, this), __res.second };
}
template <typename... _Args>
iterator
try_emplace(const_iterator __hint, const key_type& __k,
_Args&&... __args)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::try_emplace(__hint.base(), __k,
std::forward<_Args>(__args)...),
this);
}
template <typename... _Args>
iterator
try_emplace(const_iterator __hint, key_type&& __k, _Args&&... __args)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::try_emplace(__hint.base(), std::move(__k),
std::forward<_Args>(__args)...),
this);
}
template <typename _Obj>
pair<iterator, bool>
insert_or_assign(const key_type& __k, _Obj&& __obj)
{
auto __res = _Base::insert_or_assign(__k,
std::forward<_Obj>(__obj));
return { iterator(__res.first, this), __res.second };
}
template <typename _Obj>
pair<iterator, bool>
insert_or_assign(key_type&& __k, _Obj&& __obj)
{
auto __res = _Base::insert_or_assign(std::move(__k),
std::forward<_Obj>(__obj));
return { iterator(__res.first, this), __res.second };
}
template <typename _Obj>
iterator
insert_or_assign(const_iterator __hint, const key_type& __k,
_Obj&& __obj)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::insert_or_assign(__hint.base(), __k,
std::forward<_Obj>(__obj)),
this);
}
template <typename _Obj>
iterator
insert_or_assign(const_iterator __hint, key_type&& __k, _Obj&& __obj)
{
__glibcxx_check_insert(__hint);
return iterator(_Base::insert_or_assign(__hint.base(),
std::move(__k),
std::forward<_Obj>(__obj)),
this);
}
#endif
iterator
find(const key_type& __key)
{ return iterator(_Base::find(__key), this); }