summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2014-03-05 17:58:48 +0000
committerMarshall Clow <mclow.lists@gmail.com>2014-03-05 17:58:48 +0000
commit24b29a02f193db6437289e24fbe09fbf7b4bcfcb (patch)
tree03cf573b5e28c449cc49e2feef0075ffb7a55f3a
parent0d6dcb5569bd8f31228370de5f04ccb7cf0ac896 (diff)
downloadlibcxx_35a-24b29a02f193db6437289e24fbe09fbf7b4bcfcb.tar.gz
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
-rw-r--r--include/type_traits2
-rw-r--r--test/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/type_traits b/include/type_traits
index 63ab138b..660ed869 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -762,7 +762,7 @@ template <class _Tp> 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 <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY
is_final : public integral_constant<bool, __is_final(_Tp)> {};
#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 2f69c743..cf321962 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 <type_traits>
-#if __cplusplus >= 201103L
+#if _LIBCPP_STD_VER > 11
struct P final { };
union U1 { };