diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
| commit | 8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch) | |
| tree | 8b05963e8608b22f71620f512679d7cd5b1de548 /system/include/libcxx/__debug | |
| parent | a8e4801c7d38033fff760ea26a4579aa324e303e (diff) | |
| parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/__debug')
| -rw-r--r-- | system/include/libcxx/__debug | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/system/include/libcxx/__debug b/system/include/libcxx/__debug index e807fa5a..4a0e3cec 100644 --- a/system/include/libcxx/__debug +++ b/system/include/libcxx/__debug @@ -60,7 +60,7 @@ struct _LIBCPP_VISIBLE __c_node virtual bool __addable(const void*, ptrdiff_t) const = 0; virtual bool __subscriptable(const void*, ptrdiff_t) const = 0; - _LIBCPP_HIDDEN void __add(__i_node* __i); + void __add(__i_node* __i); _LIBCPP_HIDDEN void __remove(__i_node* __i); }; @@ -83,8 +83,8 @@ _C_node<_Cont>::__dereferenceable(const void* __i) const { typedef typename _Cont::const_iterator iterator; const iterator* __j = static_cast<const iterator*>(__i); - _Cont* _C = static_cast<_Cont*>(__c_); - return _C->__dereferenceable(__j); + _Cont* _Cp = static_cast<_Cont*>(__c_); + return _Cp->__dereferenceable(__j); } template <class _Cont> @@ -93,8 +93,8 @@ _C_node<_Cont>::__decrementable(const void* __i) const { typedef typename _Cont::const_iterator iterator; const iterator* __j = static_cast<const iterator*>(__i); - _Cont* _C = static_cast<_Cont*>(__c_); - return _C->__decrementable(__j); + _Cont* _Cp = static_cast<_Cont*>(__c_); + return _Cp->__decrementable(__j); } template <class _Cont> @@ -103,8 +103,8 @@ _C_node<_Cont>::__addable(const void* __i, ptrdiff_t __n) const { typedef typename _Cont::const_iterator iterator; const iterator* __j = static_cast<const iterator*>(__i); - _Cont* _C = static_cast<_Cont*>(__c_); - return _C->__addable(__j, __n); + _Cont* _Cp = static_cast<_Cont*>(__c_); + return _Cp->__addable(__j, __n); } template <class _Cont> @@ -113,8 +113,8 @@ _C_node<_Cont>::__subscriptable(const void* __i, ptrdiff_t __n) const { typedef typename _Cont::const_iterator iterator; const iterator* __j = static_cast<const iterator*>(__i); - _Cont* _C = static_cast<_Cont*>(__c_); - return _C->__subscriptable(__j, __n); + _Cont* _Cp = static_cast<_Cont*>(__c_); + return _Cp->__subscriptable(__j, __n); } class _LIBCPP_VISIBLE __libcpp_db @@ -159,6 +159,7 @@ public: void* __find_c_from_i(void* __i) const; void __invalidate_all(void* __c); __c_node* __find_c_and_lock(void* __c) const; + __c_node* __find_c(void* __c) const; void unlock() const; void swap(void* __c1, void* __c2); |