Work around MSVC's non-standard ABI for enums. Patch from STL@microsoft.com

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@276589 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2016-07-25 00:02:23 +00:00
parent 3a974c6835
commit ec1f15d9af
3 changed files with 22 additions and 5 deletions

View File

@ -21,14 +21,19 @@ enum F { W = UINT_MAX };
int main()
{
#if !defined(_WIN32) || defined(__MINGW32__)
typedef unsigned ExpectUnsigned;
#else
typedef int ExpectUnsigned; // MSVC's ABI doesn't follow the Standard
#endif
static_assert((std::is_same<std::underlying_type<E>::type, int>::value),
"E has the wrong underlying type");
static_assert((std::is_same<std::underlying_type<F>::type, unsigned>::value),
static_assert((std::is_same<std::underlying_type<F>::type, ExpectUnsigned>::value),
"F has the wrong underlying type");
#if _LIBCPP_STD_VER > 11
#if TEST_STD_VER > 11
static_assert((std::is_same<std::underlying_type_t<E>, int>::value), "");
static_assert((std::is_same<std::underlying_type_t<F>, unsigned>::value), "");
static_assert((std::is_same<std::underlying_type_t<F>, ExpectUnsigned>::value), "");
#endif
#if TEST_STD_VER >= 11
@ -36,7 +41,7 @@ int main()
static_assert((std::is_same<std::underlying_type<G>::type, char>::value),
"G has the wrong underlying type");
#if _LIBCPP_STD_VER > 11
#if TEST_STD_VER > 11
static_assert((std::is_same<std::underlying_type_t<G>, char>::value), "");
#endif
#endif // TEST_STD_VER >= 11

View File

@ -13,9 +13,15 @@
#include <type_traits>
#include "test_macros.h"
enum Enum {zero, one_};
#if TEST_STD_VER >= 11
enum BigEnum : unsigned long long // MSVC's ABI doesn't follow the Standard
#else
enum BigEnum
#endif
{
bigzero,
big = 0xFFFFFFFFFFFFFFFFULL

View File

@ -13,9 +13,15 @@
#include <type_traits>
#include "test_macros.h"
enum Enum {zero, one_};
#if TEST_STD_VER >= 11
enum BigEnum : unsigned long long // MSVC's ABI doesn't follow the Standard
#else
enum BigEnum
#endif
{
bigzero,
big = 0xFFFFFFFFFFFFFFFFULL