diff options
| author | dim <dim@FreeBSD.org> | 2012-10-22 19:06:00 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-10-22 19:06:00 +0000 |
| commit | a4f9a8cbfbdcf6617e3e960f5f391943f28f982c (patch) | |
| tree | b3ad0c9e8596b037c82da7431a0b56d7e889e49b /contrib/libc++ | |
| parent | 79f289a888cc90ade3ab05d0211600ba13c0eab4 (diff) | |
| download | FreeBSD-src-a4f9a8cbfbdcf6617e3e960f5f391943f28f982c.zip FreeBSD-src-a4f9a8cbfbdcf6617e3e960f5f391943f28f982c.tar.gz | |
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
Diffstat (limited to 'contrib/libc++')
| -rw-r--r-- | contrib/libc++/include/locale | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/libc++/include/locale b/contrib/libc++/include/locale index 0d77a4a..3e8d9a8 100644 --- a/contrib/libc++/include/locale +++ b/contrib/libc++/include/locale @@ -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_get(iter_type& __b, iter_type __e, 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)) { |
