From owner-svn-src-head@FreeBSD.ORG  Mon Oct 22 19:06:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D7AABF93;
 Mon, 22 Oct 2012 19:06:00 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id BE8898FC08;
 Mon, 22 Oct 2012 19:06:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9MJ60w2080469;
 Mon, 22 Oct 2012 19:06:00 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9MJ60kb080467;
 Mon, 22 Oct 2012 19:06:00 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201210221906.q9MJ60kb080467@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 22 Oct 2012 19:06:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241907 - head/contrib/libc++/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 19:06:00 -0000

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)) {