Support forward_list<Incomplete Type>. Patch by Zhihao Yuan!
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@200814 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/forward_list b/include/forward_list
index 398226b..72d31dc 100644
--- a/include/forward_list
+++ b/include/forward_list
@@ -188,7 +188,6 @@
template <class _NodePtr>
struct __forward_begin_node
{
- typedef __forward_begin_node __self;
typedef _NodePtr pointer;
pointer __next_;
@@ -197,16 +196,22 @@
};
template <class _Tp, class _VoidPtr>
-struct __forward_list_node
- : public __forward_begin_node
- <
- typename pointer_traits<_VoidPtr>::template
+struct _LIBCPP_HIDDEN __begin_node_of
+{
+ typedef __forward_begin_node
+ <
+ typename pointer_traits<_VoidPtr>::template
#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
- rebind<__forward_list_node<_Tp, _VoidPtr> >
+ rebind<__forward_list_node<_Tp, _VoidPtr> >
#else
- rebind<__forward_list_node<_Tp, _VoidPtr> >::other
+ rebind<__forward_list_node<_Tp, _VoidPtr> >::other
#endif
- >
+ > type;
+};
+
+template <class _Tp, class _VoidPtr>
+struct __forward_list_node
+ : public __begin_node_of<_Tp, _VoidPtr>::type
{
typedef _Tp value_type;
@@ -357,9 +362,9 @@
typedef _Tp value_type;
typedef _Alloc allocator_type;
- typedef typename allocator_traits<allocator_type>::void_pointer void_pointer;
- typedef __forward_list_node<value_type, void_pointer> __node;
- typedef typename __node::__self __begin_node;
+ typedef typename allocator_traits<allocator_type>::void_pointer void_pointer;
+ typedef __forward_list_node<value_type, void_pointer> __node;
+ typedef typename __begin_node_of<value_type, void_pointer>::type __begin_node;
typedef typename allocator_traits<allocator_type>::template
#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
rebind_alloc<__node>
