This is an archive of the discontinued LLVM Phabricator instance.

Differential D24883

[libc++] Fix typos causing compilation errors when _LIBCPP_DEBUG_LEVEL >= 2
ClosedPublic

Authored by iid_iunknown on Sep 23 2016, 1:45 PM.

Details

Reviewers
EricWF
Commits
rGeef9b35c6dd6: [libc++] Fix typos causing compilation errors when _LIBCPP_DEBUG_LEVEL >= 2
rCXX282446: [libc++] Fix typos causing compilation errors when _LIBCPP_DEBUG_LEVEL >= 2
rL282446: [libc++] Fix typos causing compilation errors when _LIBCPP_DEBUG_LEVEL >= 2
Summary

This patch fixes a couple of typos that cause compilation errors when application includes <unordered_map> and enables the libc++'s debugging capabilities.

Diff Detail

Repository
rL LLVM

Event Timeline

iid_iunknown updated this revision to Diff 72346.Sep 23 2016, 1:45 PM
iid_iunknown retitled this revision from to [libc++] Fix typos causing compilation errors when _LIBCPP_DEBUG_LEVEL >= 2.
iid_iunknown updated this object.
iid_iunknown added a reviewer: EricWF.
iid_iunknown set the repository for this revision to rL LLVM.
iid_iunknown added a subscriber: llvm-commits.
EricWF accepted this revision.Sep 23 2016, 10:28 PM
EricWF edited edge metadata.
This revision is now accepted and ready to land.Sep 23 2016, 10:28 PM
iid_iunknown added a comment.Sep 26 2016, 2:47 PM

Thanks for reviewing this, Eric!

iid_iunknown closed this revision.Sep 26 2016, 2:48 PM
Closed by commit rL282446: [libc++] Fix typos causing compilation errors when _LIBCPP_DEBUG_LEVEL >= 2 (authored by oleg). · Explain WhySep 26 2016, 2:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
trunk/
include/
4 lines

Diff 72574

libcxx/trunk/include/unordered_map

Show First 20 Lines • Show All 1,006 Lines • ▼ Show 20 Lines template <class... _Args>
_VSTD::forward_as_tuple(_VSTD::forward<_Args>(__args)...)); _VSTD::forward_as_tuple(_VSTD::forward<_Args>(__args)...));
} }
template <class... _Args> template <class... _Args>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
iterator try_emplace(const_iterator __h, const key_type& __k, _Args&&... __args) iterator try_emplace(const_iterator __h, const key_type& __k, _Args&&... __args)
{ {
#if _LIBCPP_DEBUG_LEVEL >= 2 #if _LIBCPP_DEBUG_LEVEL >= 2
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this, _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__h) == this,
"unordered_map::try_emplace(const_iterator, key, args...) called with an iterator not" "unordered_map::try_emplace(const_iterator, key, args...) called with an iterator not"
" referring to this unordered_map"); " referring to this unordered_map");
#endif #endif
return try_emplace(__k, _VSTD::forward<_Args>(__args)...).first; return try_emplace(__k, _VSTD::forward<_Args>(__args)...).first;
} }
template <class... _Args> template <class... _Args>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
iterator try_emplace(const_iterator __h, key_type&& __k, _Args&&... __args) iterator try_emplace(const_iterator __h, key_type&& __k, _Args&&... __args)
{ {
#if _LIBCPP_DEBUG_LEVEL >= 2 #if _LIBCPP_DEBUG_LEVEL >= 2
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this, _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__h) == this,
"unordered_map::try_emplace(const_iterator, key, args...) called with an iterator not" "unordered_map::try_emplace(const_iterator, key, args...) called with an iterator not"
" referring to this unordered_map"); " referring to this unordered_map");
#endif #endif
return try_emplace(_VSTD::move(__k), _VSTD::forward<_Args>(__args)...).first; return try_emplace(_VSTD::move(__k), _VSTD::forward<_Args>(__args)...).first;
} }
template <class _Vp> template <class _Vp>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
▲ Show 20 Lines • Show All 1,036 Lines • Show Last 20 Lines