From 24b29a02f193db6437289e24fbe09fbf7b4bcfcb Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 5 Mar 2014 17:58:48 +0000 Subject: [PATCH] Mark is_final as a C++14 feature. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@202991 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/type_traits | 2 +- .../utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/type_traits b/include/type_traits index 63ab138b2..660ed8695 100644 --- a/include/type_traits +++ b/include/type_traits @@ -762,7 +762,7 @@ template struct _LIBCPP_TYPE_VIS_ONLY is_abstract : public __libcpp_ // is_final -#if __has_feature(is_final) +#if _LIBCPP_STD_VER > 11 && __has_feature(is_final) template struct _LIBCPP_TYPE_VIS_ONLY is_final : public integral_constant {}; #endif diff --git a/test/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp b/test/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp index 2f69c743e..cf3219621 100644 --- a/test/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp +++ b/test/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp @@ -13,7 +13,7 @@ #include -#if __cplusplus >= 201103L +#if _LIBCPP_STD_VER > 11 struct P final { }; union U1 { };