Author: dim
Date: Mon Oct 22 19:06:00 2012
New Revision: 241907
URL: http://svn.freebsd.org/changeset/base/241907
Log:
Fix two -Wsystem-header warnings in libc++ that were exposed by the new
ATF import. These have also been sent upstream.
MFC after: 1 month
Modified:
head/contrib/libc++/include/locale
Modified: head/contrib/libc++/include/locale
==============================================================================
--- head/contrib/libc++/include/locale Mon Oct 22 18:56:31 2012
(r241906)
+++ head/contrib/libc++/include/locale Mon Oct 22 19:06:00 2012
(r241907)
@@ -2876,9 +2876,9 @@ protected:
virtual string_type do_negative_sign() const {return string_type(1, '-');}
virtual int do_frac_digits() const {return 0;}
virtual pattern do_pos_format() const
- {pattern __p = {symbol, sign, none, value}; return __p;}
+ {pattern __p = {{symbol, sign, none, value}}; return __p;}
virtual pattern do_neg_format() const
- {pattern __p = {symbol, sign, none, value}; return __p;}
+ {pattern __p = {{symbol, sign, none, value}}; return __p;}
};
template <class _CharT, bool _International>
@@ -3192,7 +3192,6 @@ money_get<_CharT, _InputIterator>::__do_
bool __sb = __flags & ios_base::showbase;
if (__sb || __more_needed)
{
- ios_base::iostate __et = ios_base::goodbit;
typename string_type::const_iterator __sym_space_end =
__sym.begin();
if (__p > 0 && (__pat.field[__p - 1] == money_base::none ||
__pat.field[__p - 1] == money_base::space)) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
