svn commit: r296679 - head/contrib/libc++/include

[Dimitry Andric]

Author: dim
Date: Fri Mar 11 20:30:06 2016
New Revision: 296679
URL: https://svnweb.freebsd.org/changeset/base/296679

Log:
  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).

Modified:
  head/contrib/libc++/include/string
  head/contrib/libc++/include/system_error

Modified: head/contrib/libc++/include/string
==============================================================================
--- head/contrib/libc++/include/string	Fri Mar 11 20:26:45 2016	(r296678)
+++ head/contrib/libc++/include/string	Fri Mar 11 20:30:06 2016	(r296679)
@@ -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;}
 

Modified: head/contrib/libc++/include/system_error
==============================================================================
--- head/contrib/libc++/include/system_error	Fri Mar 11 20:26:45 2016	(r296678)
+++ head/contrib/libc++/include/system_error	Fri Mar 11 20:30:06 2016	(r296679)
@@ -371,7 +371,7 @@ public:
     error_category() _NOEXCEPT;
 #else
     _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT _LIBCPP_DEFAULT;
+    _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT _LIBCPP_DEFAULT
 #endif
 private:
     error_category(const error_category&);// = delete;