From owner-svn-src-projects@freebsd.org  Sat Aug 27 15:59:34 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13162B76902
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 27 Aug 2016 15:59:34 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7C6FAF1;
 Sat, 27 Aug 2016 15:59:33 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7RFxX35017949;
 Sat, 27 Aug 2016 15:59:33 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7RFxXo9017948;
 Sat, 27 Aug 2016 15:59:33 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201608271559.u7RFxXo9017948@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 27 Aug 2016 15:59:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r304913 - projects/clang390-import/contrib/libc++/include
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Aug 2016 15:59:34 -0000

Author: dim
Date: Sat Aug 27 15:59:32 2016
New Revision: 304913
URL: https://svnweb.freebsd.org/changeset/base/304913

Log:
  Tentatively apply https://reviews.llvm.org/D23960, to squelch errors
  about narrowing in <bitset>.

Modified:
  projects/clang390-import/contrib/libc++/include/bitset

Modified: projects/clang390-import/contrib/libc++/include/bitset
==============================================================================
--- projects/clang390-import/contrib/libc++/include/bitset	Sat Aug 27 15:22:55 2016	(r304912)
+++ projects/clang390-import/contrib/libc++/include/bitset	Sat Aug 27 15:59:32 2016	(r304913)
@@ -262,7 +262,7 @@ __bitset<_N_words, _Size>::__bitset(unsi
 #if __SIZEOF_SIZE_T__ == 8
     : __first_{__v}
 #elif __SIZEOF_SIZE_T__ == 4
-    : __first_{__v, __v >> __bits_per_word}
+    : __first_{static_cast<__storage_type>(__v), static_cast<__storage_type>(__v >> __bits_per_word)}
 #else
 #error This constructor has not been ported to this platform
 #endif