diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-06-23 09:50:42 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-06-23 09:50:42 +0000 |
| commit | 6b8cdb0ac2a57a4d025254e4e7e9cbb54fc72862 (patch) | |
| tree | feb26a03ea46a78c0f940e33f20640a8a2574ea6 | |
| parent | b941ae6528c7f24d93a6f819ad2507727f3bd3ed (diff) | |
| download | gcc-6b8cdb0ac2a57a4d025254e4e7e9cbb54fc72862.zip gcc-6b8cdb0ac2a57a4d025254e4e7e9cbb54fc72862.tar.gz gcc-6b8cdb0ac2a57a4d025254e4e7e9cbb54fc72862.tar.bz2 | |
stl_tree.h (erase(iterator), [...]): Remove inline specifier.
2010-06-23 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_tree.h (erase(iterator), erase(const_iterator)):
Remove inline specifier.
From-SVN: r161267
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 465734f..c111b2d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2010-06-23 Paolo Carlini <paolo.carlini@oracle.com> + + * include/bits/stl_tree.h (erase(iterator), erase(const_iterator)): + Remove inline specifier. + 2010-06-22 Paolo Carlini <paolo.carlini@oracle.com> * include/profile/impl/profiler_list_to_slist.h: Fix formatting, diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 58c63cf..4e9fdf7 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -1358,7 +1358,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // DR 130. Associative erase should return an iterator. template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> - inline typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator + typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: erase(iterator __position) { @@ -1377,7 +1377,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // DR 130. Associative erase should return an iterator. template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> - inline typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::const_iterator + typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::const_iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: erase(const_iterator __position) { |