Author: caseycarter Date: Mon Apr 9 13:41:45 2018 New Revision: 329618 URL: http://llvm.org/viewvc/llvm-project?rev=329618&view=rev Log: [test] [NFC] cleanup aligned_storage test
* `s/"" )/"")/g` * Don't redundantly test triviality for `TEST_STD_VER > 17` Modified: libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp Modified: libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp?rev=329618&r1=329617&r2=329618&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp Mon Apr 9 13:41:45 2018 @@ -23,13 +23,10 @@ int main() { typedef std::aligned_storage<10, 1 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10, 1>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10, 1>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -39,13 +36,10 @@ int main() { typedef std::aligned_storage<10, 2 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10, 2>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10, 2>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -55,13 +49,10 @@ int main() { typedef std::aligned_storage<10, 4 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10, 4>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10, 4>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -71,13 +62,10 @@ int main() { typedef std::aligned_storage<10, 8 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10, 8>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10, 8>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -87,13 +75,10 @@ int main() { typedef std::aligned_storage<10, 16 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10, 16>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10, 16>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -103,13 +88,10 @@ int main() { typedef std::aligned_storage<10, 32 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10, 32>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10, 32>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -119,13 +101,10 @@ int main() { typedef std::aligned_storage<20, 32 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<20, 32>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<20, 32>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -135,13 +114,10 @@ int main() { typedef std::aligned_storage<40, 32 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<40, 32>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<40, 32>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -151,13 +127,10 @@ int main() { typedef std::aligned_storage<12, 16 >::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<12, 16>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<12, 16>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -167,13 +140,10 @@ int main() { typedef std::aligned_storage<1>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<1>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<1>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -183,13 +153,10 @@ int main() { typedef std::aligned_storage<2>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<2>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<2>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -199,13 +166,10 @@ int main() { typedef std::aligned_storage<3>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<3>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<3>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -215,13 +179,10 @@ int main() { typedef std::aligned_storage<4>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<4>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<4>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -231,13 +192,10 @@ int main() { typedef std::aligned_storage<5>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<5>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<5>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -247,7 +205,7 @@ int main() { typedef std::aligned_storage<7>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<7>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<7>, T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -257,13 +215,10 @@ int main() { typedef std::aligned_storage<8>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<8>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<8>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -273,13 +228,10 @@ int main() { typedef std::aligned_storage<9>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<9>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<9>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -289,13 +241,10 @@ int main() { typedef std::aligned_storage<15>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<15>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<15>, T1>::value, ""); #endif -#if TEST_STD_VER > 17 -// P0767 - static_assert(std::is_trivial<T1>::value, "" ); -#else - static_assert(std::is_pod<T1>::value, "" ); +#if TEST_STD_VER <= 17 + static_assert(std::is_pod<T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -311,7 +260,7 @@ int main() { typedef std::aligned_storage<16>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<16>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<16>, T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -322,7 +271,7 @@ int main() { typedef std::aligned_storage<17>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<17>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<17>, T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); @@ -333,7 +282,7 @@ int main() { typedef std::aligned_storage<10>::type T1; #if TEST_STD_VER > 11 - static_assert(std::is_same<std::aligned_storage_t<10>, T1>::value, "" ); + static_assert(std::is_same<std::aligned_storage_t<10>, T1>::value, ""); #endif static_assert(std::is_trivial<T1>::value, ""); static_assert(std::is_standard_layout<T1>::value, ""); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits