summaryrefslogtreecommitdiffstats
path: root/libcxx/include/exception
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/include/exception')
-rw-r--r--libcxx/include/exception8
1 files changed, 2 insertions, 6 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception
index 39d251ec499..5a905e7e58d 100644
--- a/libcxx/include/exception
+++ b/libcxx/include/exception
@@ -195,9 +195,7 @@ void
throw_with_nested(_Tp&& __t, typename enable_if<
is_class<typename remove_reference<_Tp>::type>::value &&
!is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
-#if _LIBCPP_STD_VER > 11 && __has_feature(is_final)
- && !is_final<typename remove_reference<_Tp>::type>::value
-#endif
+ && !__libcpp_is_final<typename remove_reference<_Tp>::type>::value
>::type* = 0)
#else // _LIBCPP_HAS_NO_RVALUE_REFERENCES
throw_with_nested (_Tp& __t, typename enable_if<
@@ -217,9 +215,7 @@ void
throw_with_nested(_Tp&& __t, typename enable_if<
!is_class<typename remove_reference<_Tp>::type>::value ||
is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
-#if _LIBCPP_STD_VER > 11 && __has_feature(is_final)
- || is_final<typename remove_reference<_Tp>::type>::value
-#endif
+ || __libcpp_is_final<typename remove_reference<_Tp>::type>::value
>::type* = 0)
#else // _LIBCPP_HAS_NO_RVALUE_REFERENCES
throw_with_nested (_Tp& __t, typename enable_if<
OpenPOWER on IntegriCloud