diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-08-14 22:00:20 +0400 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-08-14 22:00:20 +0400 |
| commit | 5d1a701d6def1e4e6ae3d5bce67efd40b07fba16 (patch) | |
| tree | f24f148cd0e121eac7f27d1423983ac369ea1bb3 /libcxx/include/string | |
| parent | a8c7c154bb820e21a141602297514b5849607148 (diff) | |
Xing Xue: port to IBM XLC++/AIX.
llvm-svn: 188396
Diffstat (limited to 'libcxx/include/string')
| -rw-r--r-- | libcxx/include/string | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index c5ed95cfb128..7439b5615bb2 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -1615,13 +1615,13 @@ private: template <size_type __a> static _LIBCPP_INLINE_VISIBILITY - size_type __align(size_type __s) _NOEXCEPT + size_type __align_it(size_type __s) _NOEXCEPT {return __s + (__a-1) & ~(__a-1);} enum {__alignment = 16}; static _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __s) _NOEXCEPT {return (__s < __min_cap ? __min_cap : - __align<sizeof(value_type) < __alignment ? + __align_it<sizeof(value_type) < __alignment ? __alignment/sizeof(value_type) : 1 > (__s+1)) - 1;} void __init(const value_type* __s, size_type __sz, size_type __reserve); |