aboutsummaryrefslogtreecommitdiff
path: root/contrib/libc++
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2012-10-22 19:06:00 +0000
committerDimitry Andric <dim@FreeBSD.org>2012-10-22 19:06:00 +0000
commitd3c53822e7d7463bbc87c53c33b1e31ba22fc323 (patch)
treeb3ad0c9e8596b037c82da7431a0b56d7e889e49b /contrib/libc++
parent52dba105d232ce9242216382127d77d6f8e06ff1 (diff)
downloadsrc-d3c53822e7d7463bbc87c53c33b1e31ba22fc323.tar.gz
src-d3c53822e7d7463bbc87c53c33b1e31ba22fc323.zip
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
Notes
Notes: svn path=/head/; revision=241907
Diffstat (limited to 'contrib/libc++')
-rw-r--r--contrib/libc++/include/locale5
1 files 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 <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)) {