From 0356a0749bed3e294fcee1ad1d47a1f681189e38 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Thu, 15 Jun 2017 20:32:09 +0000 Subject: [PATCH] =?utf8?q?2017-06-15=20=20Fran=C3=A7ois=20Dumont=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * src/c++98/tree.cc [!_GLIBCXX_INLINE_VERSION] (_Rb_tree_rotate_left, _Rb_tree_rotate_right): Delete. From-SVN: r249226 --- libstdc++-v3/ChangeLog | 5 +++++ 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 + + * src/c++98/tree.cc [!_GLIBCXX_INLINE_VERSION] + (_Rb_tree_rotate_left, _Rb_tree_rotate_right): Delete. + 2017-06-15 Rainer Orth * 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, -- 2.30.2