summaryrefslogtreecommitdiffstats
path: root/libcxx/include/__functional_base
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-09-28 19:06:12 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-09-28 19:06:12 +0000
commit3d5134dd5262960fb8f7cf0a2291dde34e23d127 (patch)
treefb379023edaded98f1313348b752ce56b34cb838 /libcxx/include/__functional_base
parent8392ab209e9c6fac9d5d3c8b70de396564458237 (diff)
downloadbcm5719-llvm-3d5134dd5262960fb8f7cf0a2291dde34e23d127.tar.gz
bcm5719-llvm-3d5134dd5262960fb8f7cf0a2291dde34e23d127.zip
Implement n3789; constexpr support in named function objects
llvm-svn: 191626
Diffstat (limited to 'libcxx/include/__functional_base')
-rw-r--r--libcxx/include/__functional_base6
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base
index 8927f9d7f37..1c337d8b4bf 100644
--- a/libcxx/include/__functional_base
+++ b/libcxx/include/__functional_base
@@ -58,7 +58,8 @@ template <class _Tp>
#endif
struct _LIBCPP_TYPE_VIS_ONLY less : binary_function<_Tp, _Tp, bool>
{
- _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
+ _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+ bool operator()(const _Tp& __x, const _Tp& __y) const
{return __x < __y;}
};
@@ -66,7 +67,8 @@ struct _LIBCPP_TYPE_VIS_ONLY less : binary_function<_Tp, _Tp, bool>
template <>
struct _LIBCPP_TYPE_VIS_ONLY less<void>
{
- template <class _T1, class _T2> _LIBCPP_INLINE_VISIBILITY
+ template <class _T1, class _T2>
+ _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
auto operator()(_T1&& __t, _T2&& __u) const
{ return _VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u); }
typedef void is_transparent;
OpenPOWER on IntegriCloud