From c003db1fcae660d055b1b29852065f67bbabd35e Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Tue, 29 Nov 2011 18:15:50 +0000 Subject: Further macro protection by replacing _[A-Z] with _[A-Z]p llvm-svn: 145410 --- libcxx/include/__sso_allocator | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libcxx/include/__sso_allocator') diff --git a/libcxx/include/__sso_allocator b/libcxx/include/__sso_allocator index 16354d83cc5..7240072cafd 100644 --- a/libcxx/include/__sso_allocator +++ b/libcxx/include/__sso_allocator @@ -21,20 +21,20 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template class _LIBCPP_HIDDEN __sso_allocator; +template class _LIBCPP_HIDDEN __sso_allocator; -template -class _LIBCPP_HIDDEN __sso_allocator +template +class _LIBCPP_HIDDEN __sso_allocator { public: typedef const void* const_pointer; typedef void value_type; }; -template +template class _LIBCPP_HIDDEN __sso_allocator { - typename aligned_storage::type buf_; + typename aligned_storage::type buf_; bool __allocated_; public: typedef size_t size_type; @@ -43,14 +43,14 @@ public: _LIBCPP_INLINE_VISIBILITY __sso_allocator() throw() : __allocated_(false) {} _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator&) throw() : __allocated_(false) {} - template _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator<_Up, _N>&) throw() + template _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator<_Up, _Np>&) throw() : __allocated_(false) {} private: __sso_allocator& operator=(const __sso_allocator&); public: - _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, typename __sso_allocator::const_pointer = 0) + _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, typename __sso_allocator::const_pointer = 0) { - if (!__allocated_ && __n <= _N) + if (!__allocated_ && __n <= _Np) { __allocated_ = true; return (pointer)&buf_; -- cgit v1.2.3