This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Cleanup _Rb_tree_impl in versioned namespace
- From: François Dumont <frs dot dumont at gmail dot com>
- To: "libstdc++ at gcc dot gnu dot org" <libstdc++ at gcc dot gnu dot org>
- Date: Sun, 22 Jan 2017 22:14:44 +0100
- Subject: Cleanup _Rb_tree_impl in versioned namespace
- Authentication-results: sourceware.org; auth=none
Hi
Jonathan proposed to leverage on versioned namespace to do some abi
breaking change so here is one simple on _Rb_tree_impl.
I wonder if versioned namespace should be bump for this change. Do
we really have any kind of abi compatibility for versioned namespace ? I
guess not but so why a versioned namespace ?
Tested under x86_64 linux, ok to commit ?
Note that I also plan some white spaces cleanup in the patch that I
have hidden by using git diff -w.
François
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 593f1ad..6cbdf9f 100644
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -670,9 +670,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
protected:
+#if _GLIBCXX_INLINE_VERSION
+ template<typename _Key_compare>
+#else
// Unused _Is_pod_comparator is kept as it is part of mangled name.
template<typename _Key_compare,
bool /* _Is_pod_comparator */ = __is_pod(_Key_compare)>
+#endif
struct _Rb_tree_impl
: public _Node_allocator
, public _Rb_tree_key_compare<_Key_compare>