[libcxx] r307751 - Fix unrepresentable enum for clang-cl unstable ABI

[Shoaib Meenai via cfe-commits]

That was what the diff was doing originally (see https://reviews.llvm.org/D35174?id=105752), but Eric suggested switching to static consts (presumably to work regardless of enum class availability).

From: cfe-commits <cfe-commits-bounces at lists.llvm.org> on behalf of David Majnemer via cfe-commits <cfe-commits at lists.llvm.org>
Reply-To: David Majnemer <david.majnemer at gmail.com>
Date: Tuesday, July 11, 2017 at 10:57 PM
To: Ben Craig <ben.craig at ni.com>
Cc: cfe-commits <cfe-commits at lists.llvm.org>
Subject: Re: [libcxx] r307751 - Fix unrepresentable enum for clang-cl unstable ABI

FWIW, I think you could just give the enum an explicit underlying type of size_type.

On Tue, Jul 11, 2017 at 6:45 PM, Ben Craig via cfe-commits <cfe-commits at lists.llvm.org<mailto:cfe-commits at lists.llvm.org>> wrote:
Author: bcraig
Date: Tue Jul 11 18:45:13 2017
New Revision: 307751

URL: http://llvm.org/viewvc/llvm-project?rev=307751&view=rev<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=>
Log:
Fix unrepresentable enum for clang-cl unstable ABI

When using LIBCXX_ABI_UNSTABLE=YES, clang-cl gave the following warning:

P:\llvm_master\src\llvm\projects\libcxx\include\string(683,51):
warning: enumerator value is not representable in the underlying type
'int' [-Wmicrosoft-enum-value]

Fixed by switching from enums to static const size_type.

https://reviews.llvm.org/D35174<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=>

Modified:
    libcxx/trunk/include/string

Modified: libcxx/trunk/include/string
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string?rev=307751&r1=307750&r2=307751&view=diff<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=>
==============================================================================
--- libcxx/trunk/include/string (original)
+++ libcxx/trunk/include/string Tue Jul 11 18:45:13 2017
@@ -676,11 +676,11 @@ private:
     };

 #if _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x01};
-    enum {__long_mask  = 0x1ul};
+    static const size_type __short_mask = 0x01;
+    static const size_type __long_mask  = 0x1ul;
 #else  // _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x80};
-    enum {__long_mask  = ~(size_type(~0) >> 1)};
+    static const size_type __short_mask = 0x80;
+    static const size_type __long_mask  = ~(size_type(~0) >> 1);
 #endif  // _LIBCPP_BIG_ENDIAN

     enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
@@ -706,11 +706,11 @@ private:
     };

 #if _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x80};
-    enum {__long_mask  = ~(size_type(~0) >> 1)};
+    static const size_type __short_mask = 0x80;
+    static const size_type __long_mask  = ~(size_type(~0) >> 1);
 #else  // _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x01};
-    enum {__long_mask  = 0x1ul};
+    static const size_type __short_mask = 0x01;
+    static const size_type __long_mask  = 0x1ul;
 #endif  // _LIBCPP_BIG_ENDIAN

     enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?


_______________________________________________
cfe-commits mailing list
cfe-commits at lists.llvm.org<mailto:cfe-commits at lists.llvm.org>
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits<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=>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170712/b0e0dc8d/attachment.html>