[libcxx] r228668 - Merging r228353:
Hans Wennborg
hans at hanshq.net
Mon Feb 9 20:00:55 PST 2015
Author: hans
Date: Mon Feb 9 22:00:55 2015
New Revision: 228668
URL: http://llvm.org/viewvc/llvm-project?rev=228668&view=rev
Log:
Merging r228353:
------------------------------------------------------------------------
r228353 | ericwf | 2015-02-05 15:01:40 -0800 (Thu, 05 Feb 2015) | 1 line
Remove use of _[A-Z] identifiers and poison them to detect usage
------------------------------------------------------------------------
Added:
libcxx/branches/release_36/test/support/nasty_macros.hpp
- copied unchanged from r228353, libcxx/trunk/test/support/nasty_macros.hpp
Modified:
libcxx/branches/release_36/ (props changed)
libcxx/branches/release_36/include/future
libcxx/branches/release_36/include/memory
libcxx/branches/release_36/test/libcxx/test/config.py
Propchange: libcxx/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 9 22:00:55 2015
@@ -1,2 +1,2 @@
/libcxx/branches/apple:136569-137939
-/libcxx/trunk:226847
+/libcxx/trunk:226847,228353
Modified: libcxx/branches/release_36/include/future
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_36/include/future?rev=228668&r1=228667&r2=228668&view=diff
==============================================================================
--- libcxx/branches/release_36/include/future (original)
+++ libcxx/branches/release_36/include/future Mon Feb 9 22:00:55 2015
@@ -783,10 +783,10 @@ __assoc_state_alloc<_Rp, _Alloc>::__on_z
{
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);
}
Modified: libcxx/branches/release_36/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_36/include/memory?rev=228668&r1=228667&r2=228668&view=diff
==============================================================================
--- libcxx/branches/release_36/include/memory (original)
+++ libcxx/branches/release_36/include/memory Mon Feb 9 22:00:55 2015
@@ -2890,8 +2890,8 @@ operator< (const unique_ptr<_T1, _D1>& _
{
typedef typename unique_ptr<_T1, _D1>::pointer _P1;
typedef typename unique_ptr<_T2, _D2>::pointer _P2;
- typedef typename common_type<_P1, _P2>::type _V;
- return less<_V>()(__x.get(), __y.get());
+ typedef typename common_type<_P1, _P2>::type _Vp;
+ return less<_Vp>()(__x.get(), __y.get());
}
template <class _T1, class _D1, class _T2, class _D2>
@@ -3677,11 +3677,11 @@ template <class _Tp, class _Dp, class _A
void
__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
{
- typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_pointer>::type _A;
- typedef allocator_traits<_A> _ATraits;
+ typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_pointer>::type _Al;
+ typedef allocator_traits<_Al> _ATraits;
typedef pointer_traits<typename _ATraits::pointer> _PTraits;
- _A __a(__data_.second());
+ _Al __a(__data_.second());
__data_.second().~_Alloc();
__a.deallocate(_PTraits::pointer_to(*this), 1);
}
@@ -3746,10 +3746,10 @@ template <class _Tp, class _Alloc>
void
__shared_ptr_emplace<_Tp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
{
- typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type _A;
- typedef allocator_traits<_A> _ATraits;
+ typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type _Al;
+ typedef allocator_traits<_Al> _ATraits;
typedef pointer_traits<typename _ATraits::pointer> _PTraits;
- _A __a(__data_.first());
+ _Al __a(__data_.first());
__data_.first().~_Alloc();
__a.deallocate(_PTraits::pointer_to(*this), 1);
}
@@ -4745,8 +4745,8 @@ inline _LIBCPP_INLINE_VISIBILITY
bool
operator<(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
{
- typedef typename common_type<_Tp*, _Up*>::type _V;
- return less<_V>()(__x.get(), __y.get());
+ typedef typename common_type<_Tp*, _Up*>::type _Vp;
+ return less<_Vp>()(__x.get(), __y.get());
}
template<class _Tp, class _Up>
Modified: libcxx/branches/release_36/test/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_36/test/libcxx/test/config.py?rev=228668&r1=228667&r2=228668&view=diff
==============================================================================
--- libcxx/branches/release_36/test/libcxx/test/config.py (original)
+++ libcxx/branches/release_36/test/libcxx/test/config.py Mon Feb 9 22:00:55 2015
@@ -268,7 +268,9 @@ class Configuration(object):
self.config.available_features.add(std)
# Configure include paths
self.compile_flags += ['-nostdinc++']
- self.compile_flags += ['-I' + self.src_root + '/test/support']
+ support_path = os.path.join(self.src_root, 'test/support')
+ self.cxx.compile_flags += ['-I' + support_path]
+ self.cxx.compile_flags += ['-include', os.path.join(support_path, 'nasty_macros.hpp')]
libcxx_headers = self.get_lit_conf('libcxx_headers',
self.src_root + '/include')
if not os.path.isdir(libcxx_headers):
More information about the cfe-commits
mailing list