diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-08-14 18:00:20 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-08-14 18:00:20 +0000 |
| commit | 5d1a701d6def1e4e6ae3d5bce67efd40b07fba16 (patch) | |
| tree | f24f148cd0e121eac7f27d1423983ac369ea1bb3 /libcxx/include/vector | |
| parent | a8c7c154bb820e21a141602297514b5849607148 (diff) | |
| download | bcm5719-llvm-5d1a701d6def1e4e6ae3d5bce67efd40b07fba16.tar.gz bcm5719-llvm-5d1a701d6def1e4e6ae3d5bce67efd40b07fba16.zip | |
Xing Xue: port to IBM XLC++/AIX.
llvm-svn: 188396
Diffstat (limited to 'libcxx/include/vector')
| -rw-r--r-- | libcxx/include/vector | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/vector b/libcxx/include/vector index 0855e8b930e..2915e127162 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -2281,7 +2281,7 @@ private: void allocate(size_type __n); void deallocate() _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY - static size_type __align(size_type __new_size) _NOEXCEPT + static size_type __align_it(size_type __new_size) _NOEXCEPT {return __new_size + (__bits_per_word-1) & ~(__bits_per_word-1);}; _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const; _LIBCPP_INLINE_VISIBILITY void __construct_at_end(size_type __n, bool __x); @@ -2454,7 +2454,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const const size_type __cap = capacity(); if (__cap >= __ms / 2) return __ms; - return _VSTD::max(2*__cap, __align(__new_size)); + return _VSTD::max(2*__cap, __align_it(__new_size)); } // Default constructs __n objects starting at __end_ |
