Get <ext/hash_map> working again

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@261180 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__hash_table b/include/__hash_table
index b358d94..87709a3 100644
--- a/include/__hash_table
+++ b/include/__hash_table
@@ -380,10 +380,12 @@
     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 @@
     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;