Commit 4814291e authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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
------------------------------------------------------------------------

llvm-svn: 228668
parent 8b2730d1

libcxx/include/future

+9 −9
Original line number Diff line number Diff line
@@ -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);

}

libcxx/include/memory

+10 −10
Original line number Diff line number Diff line
@@ -2890,8 +2890,8 @@ operator< (const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) 
{

    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 _Alloc> 
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>

libcxx/test/libcxx/test/config.py

+3 −1
Original line number Diff line number Diff line
@@ -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):

libcxx/test/support/nasty_macros.hpp

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#ifndef SUPPORT_NASTY_MACROS_HPP

#define SUPPORT_NASTY_MACROS_HPP



#define NASTY_MACRO This should not be expanded!!!

#define _A NASTY_MACRO

#define _B NASTY_MACRO

#define _C NASTY_MACRO

#define _D NASTY_MACRO

#define _E NASTY_MACRO

#define _F NASTY_MACRO

#define _G NASTY_MACRO

#define _H NASTY_MACRO

#define _I NASTY_MACRO

#define _J NASTY_MACRO

#define _K NASTY_MACRO

#define _L NASTY_MACRO

#define _M NASTY_MACRO

#define _N NASTY_MACRO

#define _O NASTY_MACRO

#define _P NASTY_MACRO

#define _Q NASTY_MACRO

#define _R NASTY_MACRO

#define _S NASTY_MACRO

#define _T NASTY_MACRO

#define _U NASTY_MACRO

#define _V NASTY_MACRO

#define _W NASTY_MACRO

#define _X NASTY_MACRO

#define _Y NASTY_MACRO

#define _Z NASTY_MACRO



#endif // SUPPORT_NASTY_MACROS_HPP