Index: test/support/test.workarounds/c1xx_broken_nullptr_conversion_operator.pass.cpp =================================================================== --- test/support/test.workarounds/c1xx_broken_nullptr_conversion_operator.pass.cpp +++ /dev/null @@ -1,29 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -// UNSUPPORTED: c++98, c++03 - -// Verify TEST_WORKAROUND_C1XX_BROKEN_NULLPTR_CONVERSION_OPERATOR. - -#include - -#include "test_workarounds.h" - -struct ConvertsToNullptr { - using DestType = decltype(nullptr); - operator DestType() const { return nullptr; } -}; - -int main() { -#if defined(TEST_WORKAROUND_C1XX_BROKEN_NULLPTR_CONVERSION_OPERATOR) - static_assert(!std::is_convertible::value, ""); -#else - static_assert(std::is_convertible::value, ""); -#endif -} Index: test/support/test_workarounds.h =================================================================== --- test/support/test_workarounds.h +++ test/support/test_workarounds.h @@ -14,15 +14,14 @@ #include "test_macros.h" #if defined(TEST_COMPILER_EDG) -# define TEST_WORKAROUND_EDG_EXPLICIT_CONSTEXPR +# define TEST_WORKAROUND_EDG_EXPLICIT_CONSTEXPR // VSO#424280 #endif #if defined(TEST_COMPILER_C1XX) -# define TEST_WORKAROUND_C1XX_BROKEN_NULLPTR_CONVERSION_OPERATOR -# define TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE -# define TEST_WORKAROUND_C1XX_EMPTY_PARAMETER_PACK_EXPANSION +# define TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE // VSO#117743 +# define TEST_WORKAROUND_C1XX_EMPTY_PARAMETER_PACK_EXPANSION // VSO#109062 # ifndef _MSC_EXTENSIONS -# define TEST_WORKAROUND_C1XX_BROKEN_ZA_CTOR_CHECK +# define TEST_WORKAROUND_C1XX_BROKEN_ZA_CTOR_CHECK // VSO#119998 # endif #endif