diff --git a/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp index 1d7b23c19..452b85174 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp @@ -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::type, int>::value), "E has the wrong underlying type"); - static_assert((std::is_same::type, unsigned>::value), - "F has the wrong underlying type"); + static_assert((std::is_same::type, ExpectUnsigned>::value), + "F has the wrong underlying type"); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, int>::value), ""); - static_assert((std::is_same, unsigned>::value), ""); + static_assert((std::is_same, ExpectUnsigned>::value), ""); #endif #if TEST_STD_VER >= 11 @@ -36,7 +41,7 @@ int main() static_assert((std::is_same::type, char>::value), "G has the wrong underlying type"); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, char>::value), ""); #endif #endif // TEST_STD_VER >= 11 diff --git a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp index eb8e31c76..069202062 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp @@ -13,9 +13,15 @@ #include +#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 diff --git a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp index 984440193..41ffdaa72 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp @@ -13,9 +13,15 @@ #include +#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