Author: ericwf
Date: Wed Feb 17 18:20:34 2016
New Revision: 261180
URL: http://llvm.org/viewvc/llvm-project?rev=261180&view=rev
Log:
Get <ext/hash_map> working again
Modified:
libcxx/trunk/include/__hash_table
Modified: libcxx/trunk/include/__hash_table
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__hash_table?rev=261180&r1=261179&r2=261180&view=diff
==============================================================================
--- libcxx/trunk/include/__hash_table (original)
+++ libcxx/trunk/include/__hash_table Wed Feb 17 18:20:34 2016
@@ -380,10 +380,12 @@ class _LIBCPP_TYPE_VIS_ONLY __hash_const
static_assert(!is_const<typename
pointer_traits<_NodePtr>::element_type>::value, "");
typedef __hash_node_types<_NodePtr> _NodeTypes;
typedef _NodePtr __node_pointer;
- typedef __hash_iterator<_NodePtr> __non_const_iterator;
+
__node_pointer __node_;
public:
+ typedef __hash_iterator<_NodePtr> __non_const_iterator;
+
typedef forward_iterator_tag
iterator_category;
typedef typename _NodeTypes::__node_value_type value_type;
typedef typename _NodeTypes::difference_type
difference_type;
@@ -655,10 +657,10 @@ class _LIBCPP_TYPE_VIS_ONLY __hash_const
typedef typename remove_const<__node>::type __non_const_node;
typedef typename __rebind_pointer<__node_pointer, __non_const_node>::type
__non_const_node_pointer;
-
+public:
typedef __hash_local_iterator<__non_const_node_pointer>
__non_const_iterator;
-public:
+
typedef forward_iterator_tag
iterator_category;
typedef typename _NodeTypes::__node_value_type value_type;
typedef typename _NodeTypes::difference_type
difference_type;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
