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

2017-05-11 François Dumont <fdumont@gcc.gnu.org> 

* include/bits/stl_tree.h [_GLIBCXX_INLINE_VERSION]
	(_Rb_tree_impl<>): Remove _Is_pod_comparator
	template parameter.

From-SVN: r247929
This commit is contained in:
François Dumont 2017-05-11 20:30:44 +00:00
parent 1bea0f2663
commit fee84d551f
2 changed files with 107 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
2017-05-11 François Dumont <fdumont@gcc.gnu.org> 2017-05-11 François Dumont <fdumont@gcc.gnu.org>
* include/bits/stl_tree.h [_GLIBCXX_INLINE_VERSION]
(_Rb_tree_impl<>): Remove _Is_pod_comparator
template parameter.
* include/debug/safe_container.h [_GLIBCXX_USE_CXX11_ABI] * include/debug/safe_container.h [_GLIBCXX_USE_CXX11_ABI]
(_Safe_container<>): Remove _IsCxx11AllocatorAware template parameter. (_Safe_container<>): Remove _IsCxx11AllocatorAware template parameter.
* include/debug/string: Adapt. * include/debug/string: Adapt.
@ -48,8 +52,6 @@
* include/std/variant: Adapt. * include/std/variant: Adapt.
* python/libstdcxx/v6/printers.py: Adapt. * python/libstdcxx/v6/printers.py: Adapt.
* testsuite/libstdc++-prettyprinters/48362.cc: Adapt. * testsuite/libstdc++-prettyprinters/48362.cc: Adapt.
* include/bits/stl_tree.h (_Rb_tree_impl<>): Remove _Is_pod_comparator
template parameter when version namespace is active.
* include/bits/stl_algobase.h (std::__iter_swap<false>): Remove * include/bits/stl_algobase.h (std::__iter_swap<false>): Remove
_GLIBCXX_MOVE usage. _GLIBCXX_MOVE usage.

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

@ -671,9 +671,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
protected: protected:
#if _GLIBCXX_INLINE_VERSION
template<typename _Key_compare>
#else
// Unused _Is_pod_comparator is kept as it is part of mangled name. // Unused _Is_pod_comparator is kept as it is part of mangled name.
template<typename _Key_compare, template<typename _Key_compare,
bool /* _Is_pod_comparator */ = __is_pod(_Key_compare)> bool /* _Is_pod_comparator */ = __is_pod(_Key_compare)>
#endif
struct _Rb_tree_impl struct _Rb_tree_impl
: public _Node_allocator : public _Node_allocator
, public _Rb_tree_key_compare<_Key_compare> , public _Rb_tree_key_compare<_Key_compare>