summaryrefslogtreecommitdiffstats
path: root/libcxx/include/future
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-02-05 23:01:40 +0000
committerEric Fiselier <eric@efcs.ca>2015-02-05 23:01:40 +0000
commit6fe361c1efc9e7c38c164fc6469857a84d3cb299 (patch)
treedde0ea439fc4b9d325e00401045ed17f3841e810 /libcxx/include/future
parentf038a525428dc14fa80fb92763b030b3402923ec (diff)
downloadbcm5719-llvm-6fe361c1efc9e7c38c164fc6469857a84d3cb299.tar.gz
bcm5719-llvm-6fe361c1efc9e7c38c164fc6469857a84d3cb299.zip
Remove use of _[A-Z] identifiers and poison them to detect usage
llvm-svn: 228353
Diffstat (limited to 'libcxx/include/future')
-rw-r--r--libcxx/include/future18
1 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/include/future b/libcxx/include/future
index 6fe6f8da504..ad7af72b12f 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -783,10 +783,10 @@ __assoc_state_alloc<_Rp, _Alloc>::__on_zero_shared() _NOEXCEPT
{
if (this->__state_ & base::__constructed)
reinterpret_cast<_Rp*>(_VSTD::addressof(this->__value_))->~_Rp();
- typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _A;
- typedef allocator_traits<_A> _ATraits;
+ typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _Al;
+ typedef allocator_traits<_Al> _ATraits;
typedef pointer_traits<typename _ATraits::pointer> _PTraits;
- _A __a(__alloc_);
+ _Al __a(__alloc_);
this->~__assoc_state_alloc();
__a.deallocate(_PTraits::pointer_to(*this), 1);
}
@@ -809,10 +809,10 @@ template <class _Rp, class _Alloc>
void
__assoc_state_alloc<_Rp&, _Alloc>::__on_zero_shared() _NOEXCEPT
{
- typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _A;
- typedef allocator_traits<_A> _ATraits;
+ typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _Al;
+ typedef allocator_traits<_Al> _ATraits;
typedef pointer_traits<typename _ATraits::pointer> _PTraits;
- _A __a(__alloc_);
+ _Al __a(__alloc_);
this->~__assoc_state_alloc();
__a.deallocate(_PTraits::pointer_to(*this), 1);
}
@@ -835,10 +835,10 @@ template <class _Alloc>
void
__assoc_sub_state_alloc<_Alloc>::__on_zero_shared() _NOEXCEPT
{
- typedef typename __allocator_traits_rebind<_Alloc, __assoc_sub_state_alloc>::type _A;
- typedef allocator_traits<_A> _ATraits;
+ typedef typename __allocator_traits_rebind<_Alloc, __assoc_sub_state_alloc>::type _Al;
+ typedef allocator_traits<_Al> _ATraits;
typedef pointer_traits<typename _ATraits::pointer> _PTraits;
- _A __a(__alloc_);
+ _Al __a(__alloc_);
this->~__assoc_sub_state_alloc();
__a.deallocate(_PTraits::pointer_to(*this), 1);
}
OpenPOWER on IntegriCloud