summaryrefslogtreecommitdiffstats
path: root/libcxx/include/__hash_table
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2019-04-24 09:43:44 +0000
committerEric Fiselier <eric@efcs.ca>2019-04-24 09:43:44 +0000
commit6886f1e39bbb1adb4b16be6e3293c4f339358dbf (patch)
tree76f59960b520966ffe136a267867625f91db7df7 /libcxx/include/__hash_table
parent3ba9a43057f5b0e31a3e922e8ceec6c45f434b8e (diff)
downloadbcm5719-llvm-6886f1e39bbb1adb4b16be6e3293c4f339358dbf.tar.gz
bcm5719-llvm-6886f1e39bbb1adb4b16be6e3293c4f339358dbf.zip
Avoid name conflict with kernel headers
llvm-svn: 359080
Diffstat (limited to 'libcxx/include/__hash_table')
-rw-r--r--libcxx/include/__hash_table8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table
index 4b04dd62dbb..e02d3472902 100644
--- a/libcxx/include/__hash_table
+++ b/libcxx/include/__hash_table
@@ -2248,7 +2248,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_unique(
return _InsertReturnType{end(), false, _NodeHandle()};
pair<iterator, bool> __result = __node_insert_unique(__nh.__ptr_);
if (__result.second)
- __nh.__release();
+ __nh.__release_ptr();
return _InsertReturnType{__result.first, __result.second, _VSTD::move(__nh)};
}
@@ -2263,7 +2263,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_unique(
return end();
pair<iterator, bool> __result = __node_insert_unique(__nh.__ptr_);
if (__result.second)
- __nh.__release();
+ __nh.__release_ptr();
return __result.first;
}
@@ -2327,7 +2327,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_multi(
if (__nh.empty())
return end();
iterator __result = __node_insert_multi(__nh.__ptr_);
- __nh.__release();
+ __nh.__release_ptr();
return __result;
}
@@ -2341,7 +2341,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_multi(
if (__nh.empty())
return end();
iterator __result = __node_insert_multi(__hint, __nh.__ptr_);
- __nh.__release();
+ __nh.__release_ptr();
return __result;
}
OpenPOWER on IntegriCloud