<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Title" content="">
<meta name="Keywords" content="">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.msoIns
{mso-style-type:export-only;
mso-style-name:"";
text-decoration:underline;
color:teal;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body bgcolor="white" lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal">That was what the diff was doing originally (see <a href="https://reviews.llvm.org/D35174?id=105752)">
https://reviews.llvm.org/D35174?id=105752)</a>, but Eric suggested switching to static consts (presumably to work regardless of enum class availability).<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:12.0pt;color:black">From: </span></b><span style="font-size:12.0pt;color:black">cfe-commits <cfe-commits-bounces@lists.llvm.org> on behalf of David Majnemer via cfe-commits <cfe-commits@lists.llvm.org><br>
<b>Reply-To: </b>David Majnemer <david.majnemer@gmail.com><br>
<b>Date: </b>Tuesday, July 11, 2017 at 10:57 PM<br>
<b>To: </b>Ben Craig <ben.craig@ni.com><br>
<b>Cc: </b>cfe-commits <cfe-commits@lists.llvm.org><br>
<b>Subject: </b>Re: [libcxx] r307751 - Fix unrepresentable enum for clang-cl unstable ABI<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">FWIW, I think you could just give the enum an explicit underlying type of size_type.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On Tue, Jul 11, 2017 at 6:45 PM, Ben Craig via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<o:p></o:p></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<p class="MsoNormal">Author: bcraig<br>
Date: Tue Jul 11 18:45:13 2017<br>
New Revision: 307751<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D307751-26view-3Drev&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=Al3ss93XugI9bIwKEbCwGSEAjNpwS59a2_0TYpj2V5o&s=WBppCMWm-1SBMOSildXNOcNjOEVkEATVVmpWqBT6ppY&e=" target="_blank">
http://llvm.org/viewvc/llvm-project?rev=307751&view=rev</a><br>
Log:<br>
Fix unrepresentable enum for clang-cl unstable ABI<br>
<br>
When using LIBCXX_ABI_UNSTABLE=YES, clang-cl gave the following warning:<br>
<br>
P:\llvm_master\src\llvm\projects\libcxx\include\string(683,51):<br>
warning: enumerator value is not representable in the underlying type<br>
'int' [-Wmicrosoft-enum-value]<br>
<br>
Fixed by switching from enums to static const size_type.<br>
<br>
<a href="https://urldefense.proofpoint.com/v2/url?u=https-3A__reviews.llvm.org_D35174&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=Al3ss93XugI9bIwKEbCwGSEAjNpwS59a2_0TYpj2V5o&s=QkYzJCsy03aP5Id5cIPbMy2h89BSMHFTQRk3vzDGwOY&e=" target="_blank">https://reviews.llvm.org/D35174</a><br>
<br>
Modified:<br>
libcxx/trunk/include/string<br>
<br>
Modified: libcxx/trunk/include/string<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_include_string-3Frev-3D307751-26r1-3D307750-26r2-3D307751-26view-3Ddiff&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=Al3ss93XugI9bIwKEbCwGSEAjNpwS59a2_0TYpj2V5o&s=Dl5rZ9I376arg_gWk2SdVEbVwSnXPhQyB3bqELKhnmw&e=" target="_blank">
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string?rev=307751&r1=307750&r2=307751&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/include/string (original)<br>
+++ libcxx/trunk/include/string Tue Jul 11 18:45:13 2017<br>
@@ -676,11 +676,11 @@ private:<br>
};<br>
<br>
#if _LIBCPP_BIG_ENDIAN<br>
- enum {__short_mask = 0x01};<br>
- enum {__long_mask = 0x1ul};<br>
+ static const size_type __short_mask = 0x01;<br>
+ static const size_type __long_mask = 0x1ul;<br>
#else // _LIBCPP_BIG_ENDIAN<br>
- enum {__short_mask = 0x80};<br>
- enum {__long_mask = ~(size_type(~0) >> 1)};<br>
+ static const size_type __short_mask = 0x80;<br>
+ static const size_type __long_mask = ~(size_type(~0) >> 1);<br>
#endif // _LIBCPP_BIG_ENDIAN<br>
<br>
enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?<br>
@@ -706,11 +706,11 @@ private:<br>
};<br>
<br>
#if _LIBCPP_BIG_ENDIAN<br>
- enum {__short_mask = 0x80};<br>
- enum {__long_mask = ~(size_type(~0) >> 1)};<br>
+ static const size_type __short_mask = 0x80;<br>
+ static const size_type __long_mask = ~(size_type(~0) >> 1);<br>
#else // _LIBCPP_BIG_ENDIAN<br>
- enum {__short_mask = 0x01};<br>
- enum {__long_mask = 0x1ul};<br>
+ static const size_type __short_mask = 0x01;<br>
+ static const size_type __long_mask = 0x1ul;<br>
#endif // _LIBCPP_BIG_ENDIAN<br>
<br>
enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_cfe-2Dcommits&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=Al3ss93XugI9bIwKEbCwGSEAjNpwS59a2_0TYpj2V5o&s=4uXP_QwyDcL_9jZSny3SFj2dvf81DxOnu21QJBi_ANQ&e=" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><o:p></o:p></p>
</blockquote>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</body>
</html>