Author: marshall Date: Sun Nov 29 23:03:35 2015 New Revision: 254284 URL: http://llvm.org/viewvc/llvm-project?rev=254284&view=rev Log: Fix bad macros in tests
Modified: libcxx/trunk/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp libcxx/trunk/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp libcxx/trunk/test/std/utilities/meta/meta.rel/is_same.pass.cpp Modified: libcxx/trunk/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp?rev=254284&r1=254283&r2=254284&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp Sun Nov 29 23:03:35 2015 @@ -22,7 +22,7 @@ void test_is_base_of() static_assert((std::is_base_of<const T, U>::value), ""); static_assert((std::is_base_of<T, const U>::value), ""); static_assert((std::is_base_of<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_base_of_v<T, U>), ""); static_assert((std::is_base_of_v<const T, U>), ""); static_assert((std::is_base_of_v<T, const U>), ""); Modified: libcxx/trunk/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp?rev=254284&r1=254283&r2=254284&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp Sun Nov 29 23:03:35 2015 @@ -22,7 +22,7 @@ void test_is_convertible() static_assert((std::is_convertible<const T, U>::value), ""); static_assert((std::is_convertible<T, const U>::value), ""); static_assert((std::is_convertible<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_convertible_v<T, U>), ""); static_assert((std::is_convertible_v<const T, U>), ""); static_assert((std::is_convertible_v<T, const U>), ""); @@ -37,7 +37,7 @@ void test_is_not_convertible() static_assert((!std::is_convertible<const T, U>::value), ""); static_assert((!std::is_convertible<T, const U>::value), ""); static_assert((!std::is_convertible<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((!std::is_convertible_v<T, U>), ""); static_assert((!std::is_convertible_v<const T, U>), ""); static_assert((!std::is_convertible_v<T, const U>), ""); Modified: libcxx/trunk/test/std/utilities/meta/meta.rel/is_same.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.rel/is_same.pass.cpp?rev=254284&r1=254283&r2=254284&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/meta/meta.rel/is_same.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/meta/meta.rel/is_same.pass.cpp Sun Nov 29 23:03:35 2015 @@ -22,7 +22,7 @@ void test_is_same() static_assert((!std::is_same<const T, U>::value), ""); static_assert((!std::is_same<T, const U>::value), ""); static_assert(( std::is_same<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert(( std::is_same_v<T, U>), ""); static_assert((!std::is_same_v<const T, U>), ""); static_assert((!std::is_same_v<T, const U>), ""); @@ -37,7 +37,7 @@ void test_is_same_ref() static_assert((std::is_same<const T, U>::value), ""); static_assert((std::is_same<T, const U>::value), ""); static_assert((std::is_same<const T, const U>::value), ""); -#if TEST_STD_VERS > 14 +#if TEST_STD_VER > 14 static_assert((std::is_same_v<T, U>), ""); static_assert((std::is_same_v<const T, U>), ""); static_assert((std::is_same_v<T, const U>), ""); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits