@@ -1225,11 +1225,6 @@ public:
1225
1225
1226
1226
_LIBCPP_HIDE_FROM_ABI __node_holder remove (const_iterator __p) _NOEXCEPT;
1227
1227
1228
- private:
1229
- _LIBCPP_HIDE_FROM_ABI __node_base_pointer& __find_leaf_low (__parent_pointer& __parent, const key_type& __v);
1230
- _LIBCPP_HIDE_FROM_ABI __node_base_pointer& __find_leaf_high (__parent_pointer& __parent, const key_type& __v);
1231
- _LIBCPP_HIDE_FROM_ABI __node_base_pointer&
1232
- __find_leaf (const_iterator __hint, __parent_pointer& __parent, const key_type& __v);
1233
1228
// FIXME: Make this function const qualified. Unfortunately doing so
1234
1229
// breaks existing code which uses non-const callable comparators.
1235
1230
template <class _Key >
@@ -1242,12 +1237,6 @@ private:
1242
1237
_LIBCPP_HIDE_FROM_ABI __node_base_pointer&
1243
1238
__find_equal (const_iterator __hint, __parent_pointer& __parent, __node_base_pointer& __dummy, const _Key& __v);
1244
1239
1245
- template <class ... _Args>
1246
- _LIBCPP_HIDE_FROM_ABI __node_holder __construct_node (_Args&&... __args);
1247
-
1248
- // TODO: Make this _LIBCPP_HIDE_FROM_ABI
1249
- _LIBCPP_HIDDEN void destroy (__node_pointer __nd) _NOEXCEPT;
1250
-
1251
1240
_LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc (const __tree& __t ) {
1252
1241
__copy_assign_alloc (__t , integral_constant<bool , __node_traits::propagate_on_container_copy_assignment::value>());
1253
1242
}
@@ -1259,6 +1248,18 @@ private:
1259
1248
}
1260
1249
_LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc (const __tree&, false_type) {}
1261
1250
1251
+ private:
1252
+ _LIBCPP_HIDE_FROM_ABI __node_base_pointer& __find_leaf_low (__parent_pointer& __parent, const key_type& __v);
1253
+ _LIBCPP_HIDE_FROM_ABI __node_base_pointer& __find_leaf_high (__parent_pointer& __parent, const key_type& __v);
1254
+ _LIBCPP_HIDE_FROM_ABI __node_base_pointer&
1255
+ __find_leaf (const_iterator __hint, __parent_pointer& __parent, const key_type& __v);
1256
+
1257
+ template <class ... _Args>
1258
+ _LIBCPP_HIDE_FROM_ABI __node_holder __construct_node (_Args&&... __args);
1259
+
1260
+ // TODO: Make this _LIBCPP_HIDE_FROM_ABI
1261
+ _LIBCPP_HIDDEN void destroy (__node_pointer __nd) _NOEXCEPT;
1262
+
1262
1263
_LIBCPP_HIDE_FROM_ABI void __move_assign (__tree& __t , false_type);
1263
1264
_LIBCPP_HIDE_FROM_ABI void __move_assign (__tree& __t , true_type) _NOEXCEPT_(
1264
1265
is_nothrow_move_assignable<value_compare>::value&& is_nothrow_move_assignable<__node_allocator>::value);
@@ -1311,11 +1312,6 @@ private:
1311
1312
__node_pointer __cache_root_;
1312
1313
__node_pointer __cache_elem_;
1313
1314
};
1314
-
1315
- template <class , class , class , class >
1316
- friend class _LIBCPP_TEMPLATE_VIS map;
1317
- template <class , class , class , class >
1318
- friend class _LIBCPP_TEMPLATE_VIS multimap;
1319
1315
};
1320
1316
1321
1317
template <class _Tp , class _Compare , class _Allocator >
0 commit comments