From d3c53822e7d7463bbc87c53c33b1e31ba22fc323 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 22 Oct 2012 19:06:00 +0000 Subject: [PATCH] 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 --- contrib/libc++/include/locale | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/libc++/include/locale b/contrib/libc++/include/locale index 0d77a4a13e79..3e8d9a82a493 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 @@ -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)) {