summaryrefslogtreecommitdiffstats
path: root/libcxx/include/__sso_allocator
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-11-29 18:15:50 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-11-29 18:15:50 +0000
commitc003db1fcae660d055b1b29852065f67bbabd35e (patch)
treeaf77ff4d08341945ef328dddea31ed7c8919ca82 /libcxx/include/__sso_allocator
parentde3a2118db444f4a612ff6b9487face43eb512a6 (diff)
downloadbcm5719-llvm-c003db1fcae660d055b1b29852065f67bbabd35e.tar.gz
bcm5719-llvm-c003db1fcae660d055b1b29852065f67bbabd35e.zip
Further macro protection by replacing _[A-Z] with _[A-Z]p
llvm-svn: 145410
Diffstat (limited to 'libcxx/include/__sso_allocator')
-rw-r--r--libcxx/include/__sso_allocator16
1 files changed, 8 insertions, 8 deletions
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 _Tp, size_t _N> class _LIBCPP_HIDDEN __sso_allocator;
+template <class _Tp, size_t _Np> class _LIBCPP_HIDDEN __sso_allocator;
-template <size_t _N>
-class _LIBCPP_HIDDEN __sso_allocator<void, _N>
+template <size_t _Np>
+class _LIBCPP_HIDDEN __sso_allocator<void, _Np>
{
public:
typedef const void* const_pointer;
typedef void value_type;
};
-template <class _Tp, size_t _N>
+template <class _Tp, size_t _Np>
class _LIBCPP_HIDDEN __sso_allocator
{
- typename aligned_storage<sizeof(_Tp) * _N>::type buf_;
+ typename aligned_storage<sizeof(_Tp) * _Np>::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 <class _Up> _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator<_Up, _N>&) throw()
+ template <class _Up> _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<void, _N>::const_pointer = 0)
+ _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, typename __sso_allocator<void, _Np>::const_pointer = 0)
{
- if (!__allocated_ && __n <= _N)
+ if (!__allocated_ && __n <= _Np)
{
__allocated_ = true;
return (pointer)&buf_;
OpenPOWER on IntegriCloud