summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-11-06 21:48:33 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-11-06 21:48:33 +0000
commit3e2740a36cf5f41a9e8306e5e911f2b9a57a15ee (patch)
tree94d45ea984f36c571fa5a304707ec6332ad7ec10 /libcxx
parenta01739a03a4b9bbaf125497ae68e473cec920479 (diff)
downloadbcm5719-llvm-3e2740a36cf5f41a9e8306e5e911f2b9a57a15ee.tar.gz
bcm5719-llvm-3e2740a36cf5f41a9e8306e5e911f2b9a57a15ee.zip
Dimitry Andric: Silence some warnings in <locale>.
llvm-svn: 167492
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/include/locale5
1 files changed, 2 insertions, 3 deletions
diff --git a/libcxx/include/locale b/libcxx/include/locale
index 72b4729bae4..976c4cf50a1 100644
--- a/libcxx/include/locale
+++ b/libcxx/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)) {
OpenPOWER on IntegriCloud