Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp @@ -35,6 +35,7 @@ typedef check_bitmask_type BitmaskTester; assert(BitmaskTester::check()); +#ifdef _LIBCPP_VERSION static_assert( E::none == ME(0), "Expected enumeration values do not match"); @@ -59,6 +60,7 @@ E::create_symlinks == ME(128) && E::create_hard_links == ME(256), "Expected enumeration values do not match"); +#endif return 0; } Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.file_type.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.file_type.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.file_type.pass.cpp @@ -31,7 +31,7 @@ LIBCPP_ONLY(static_assert(std::is_same::value, "")); // Implementation detail - static_assert( + LIBCPP_ONLY(static_assert( E::none == ME(0) && E::not_found == ME(-1) && E::regular == ME(1) && @@ -42,7 +42,7 @@ E::fifo == ME(6) && E::socket == ME(7) && E::unknown == ME(8), - "Expected enumeration values do not match"); + "Expected enumeration values do not match")); return 0; } Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.path.format.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.path.format.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.path.format.pass.cpp @@ -25,7 +25,7 @@ // Check that E is a scoped enum by checking for conversions. typedef std::underlying_type::type UT; - static_assert(!std::is_convertible::value, ""); + LIBCPP_ONLY(static_assert(!std::is_convertible::value, "")); LIBCPP_ONLY(static_assert(std::is_same::value, "")); // Implementation detail