diff options
| author | dim <dim@FreeBSD.org> | 2016-03-11 20:30:06 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-03-11 20:30:06 +0000 |
| commit | c7d3f0869b708ea831a468bafc24c35dcaeb48b1 (patch) | |
| tree | ffecdc8300de20e3337aa723a622a3fa0ee03ea7 /contrib/libc++/include/string | |
| parent | 23ec6e34dcd11362068881933d01b08b710f6faf (diff) | |
| download | FreeBSD-src-c7d3f0869b708ea831a468bafc24c35dcaeb48b1.zip FreeBSD-src-c7d3f0869b708ea831a468bafc24c35dcaeb48b1.tar.gz | |
Pull in r246280 from upstream libc++ trunk (by Eric Fiselier):
Fix most GCC warnings during build. Only -Wattribute left.
This helps to fix a number of -Werror warnings when building world with
recent versions of gcc (e.g. the devel/*-xtoolchain-gcc ports).
Diffstat (limited to 'contrib/libc++/include/string')
| -rw-r--r-- | contrib/libc++/include/string | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/libc++/include/string b/contrib/libc++/include/string index 5777ee2..6e63ab1 100644 --- a/contrib/libc++/include/string +++ b/contrib/libc++/include/string @@ -1445,7 +1445,8 @@ public: _LIBCPP_INLINE_VISIBILITY size_type length() const _NOEXCEPT {return size();} _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY size_type capacity() const _NOEXCEPT - {return (__is_long() ? __get_long_cap() : __min_cap) - 1;} + {return (__is_long() ? __get_long_cap() + : static_cast<size_type>(__min_cap)) - 1;} void resize(size_type __n, value_type __c); _LIBCPP_INLINE_VISIBILITY void resize(size_type __n) {resize(__n, value_type());} @@ -1785,11 +1786,11 @@ private: template <size_type __a> static _LIBCPP_INLINE_VISIBILITY size_type __align_it(size_type __s) _NOEXCEPT - {return __s + (__a-1) & ~(__a-1);} + {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 : + {return (__s < __min_cap ? static_cast<size_type>(__min_cap) : __align_it<sizeof(value_type) < __alignment ? __alignment/sizeof(value_type) : 1 > (__s+1)) - 1;} |
