diff options
3 files changed, 5 insertions, 13 deletions
diff --git a/libcxx/include/experimental/utility b/libcxx/include/experimental/utility index 12a7d050f44..84e461af073 100644 --- a/libcxx/include/experimental/utility +++ b/libcxx/include/experimental/utility @@ -33,8 +33,6 @@ inline namespace fundamentals_v1 { # include <experimental/__config> -#if _LIBCPP_STD_VER > 11 - # include <utility> _LIBCPP_BEGIN_NAMESPACE_LFTS @@ -43,6 +41,4 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS _LIBCPP_END_NAMESPACE_LFTS -#endif /* _LIBCPP_STD_VER > 11 */ - #endif /* _LIBCPP_EXPERIMENTAL_UTILITY */ diff --git a/libcxx/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp b/libcxx/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp index 5f89e5367b0..3e38d5ec503 100644 --- a/libcxx/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp +++ b/libcxx/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp @@ -13,8 +13,5 @@ int main() { -#if _LIBCPP_STD_VER > 11 - using std::experimental::erased_type; - constexpr erased_type e{}; -#endif + std::experimental::erased_type e(); } diff --git a/libcxx/test/experimental/utilities/utility/utility.synop/includes.pass.cpp b/libcxx/test/experimental/utilities/utility/utility.synop/includes.pass.cpp index bcdd8b3879e..2583d434540 100644 --- a/libcxx/test/experimental/utilities/utility/utility.synop/includes.pass.cpp +++ b/libcxx/test/experimental/utilities/utility/utility.synop/includes.pass.cpp @@ -11,11 +11,10 @@ #include <experimental/utility> +#ifndef _LIBCPP_UTILITY +# error "<experimental/utility> must include <utility>" +#endif + int main() { -#if _LIBCPP_STD_VER > 11 -# ifndef _LIBCPP_UTILITY -# error "<experimental/utility> must include <utility>" -# endif -#endif /* _LIBCPP_STD_VER > 11 */ } |
