diff options
| author | fdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-15 20:32:09 +0000 |
|---|---|---|
| committer | fdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-15 20:32:09 +0000 |
| commit | ab9da4c107f1f227f2ed6dc546b76c266c47f9ff (patch) | |
| tree | 05d2e8e5f7485273f504459fc83488cae017d932 /libstdc++-v3 | |
| parent | a86692851a90a8cdab8a2c6df52d89f942987d0b (diff) | |
| download | gcc-ab9da4c107f1f227f2ed6dc546b76c266c47f9ff.tar.gz | |
2017-06-15 François Dumont <fdumont@gcc.gnu.org>
* src/c++98/tree.cc [!_GLIBCXX_INLINE_VERSION]
(_Rb_tree_rotate_left, _Rb_tree_rotate_right): Delete.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249226 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/tree.cc | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 276110dd220..ceb4811ff35 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2017-06-15 François Dumont <fdumont@gcc.gnu.org> + + * src/c++98/tree.cc [!_GLIBCXX_INLINE_VERSION] + (_Rb_tree_rotate_left, _Rb_tree_rotate_right): Delete. + 2017-06-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * testsuite: Add dg-require-effective-target pthread to -pthread diff --git a/libstdc++-v3/src/c++98/tree.cc b/libstdc++-v3/src/c++98/tree.cc index 50fa7cf9f31..0984b05e0af 100644 --- a/libstdc++-v3/src/c++98/tree.cc +++ b/libstdc++-v3/src/c++98/tree.cc @@ -150,15 +150,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __x->_M_parent = __y; } +#if !_GLIBCXX_INLINE_VERSION /* Static keyword was missing on _Rb_tree_rotate_left. Export the symbol for backward compatibility until next ABI change. */ void _Rb_tree_rotate_left(_Rb_tree_node_base* const __x, _Rb_tree_node_base*& __root) - { - local_Rb_tree_rotate_left (__x, __root); - } + { local_Rb_tree_rotate_left (__x, __root); } +#endif static void local_Rb_tree_rotate_right(_Rb_tree_node_base* const __x, @@ -181,15 +181,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __x->_M_parent = __y; } +#if !_GLIBCXX_INLINE_VERSION /* Static keyword was missing on _Rb_tree_rotate_right Export the symbol for backward compatibility until next ABI change. */ void _Rb_tree_rotate_right(_Rb_tree_node_base* const __x, _Rb_tree_node_base*& __root) - { - local_Rb_tree_rotate_right (__x, __root); - } + { local_Rb_tree_rotate_right (__x, __root); } +#endif void _Rb_tree_insert_and_rebalance(const bool __insert_left, |