diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-11-28 22:24:19 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-11-28 22:24:19 +0000 |
| commit | 9d25ada420feea3a3ffafbb3eeee3679da774042 (patch) | |
| tree | 1e974d035dbb990bd33bdd9759338b85adc5af4a /libcxx/include/__sso_allocator | |
| parent | bc5679eaff576da9475808bc04935b9c25cd32b4 (diff) | |
| download | bcm5719-llvm-9d25ada420feea3a3ffafbb3eeee3679da774042.tar.gz bcm5719-llvm-9d25ada420feea3a3ffafbb3eeee3679da774042.zip | |
Revert "Move internal usages of `alignof`/`__alignof` to use `_LIBCPP_ALIGNOF`. "
This reverts commit 087f065cb0c7463f521a62599884493aaee2ea12.
The tests were failing on 32 bit builds, and I don't have time
to clean them up right now. I'll recommit tomorrow with fixed tests.
llvm-svn: 347816
Diffstat (limited to 'libcxx/include/__sso_allocator')
| -rw-r--r-- | libcxx/include/__sso_allocator | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/__sso_allocator b/libcxx/include/__sso_allocator index 8aca0495d75..e16b680ec55 100644 --- a/libcxx/include/__sso_allocator +++ b/libcxx/include/__sso_allocator @@ -55,14 +55,14 @@ public: __allocated_ = true; return (pointer)&buf_; } - return static_cast<pointer>(_VSTD::__libcpp_allocate(__n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp))); + return static_cast<pointer>(_VSTD::__libcpp_allocate(__n * sizeof(_Tp), __alignof(_Tp))); } _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type __n) { if (__p == (pointer)&buf_) __allocated_ = false; else - _VSTD::__libcpp_deallocate(__p, __n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp)); + _VSTD::__libcpp_deallocate(__p, __n * sizeof(_Tp), __alignof(_Tp)); } _LIBCPP_INLINE_VISIBILITY size_type max_size() const throw() {return size_type(~0) / sizeof(_Tp);} |
