summaryrefslogtreecommitdiffstats
path: root/libcxx/include/__functional_base
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-02-25 12:20:52 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-02-25 12:20:52 +0000
commita64f2fbc09cae6d58a4b944e475f40ec491c0a26 (patch)
tree6f7308b83297c69009aa80c4ce5bbb839de89e41 /libcxx/include/__functional_base
parentca0bbff3a70b0a2dde3426af546b01f93cf2f166 (diff)
downloadbcm5719-llvm-a64f2fbc09cae6d58a4b944e475f40ec491c0a26.tar.gz
bcm5719-llvm-a64f2fbc09cae6d58a4b944e475f40ec491c0a26.zip
Add trailing return types (and noexcept specifications) to the 'diamond operators'. Fixes PR#22600.
llvm-svn: 230484
Diffstat (limited to 'libcxx/include/__functional_base')
-rw-r--r--libcxx/include/__functional_base4
1 files changed, 3 insertions, 1 deletions
diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base
index e174e0ca003..09424bc025a 100644
--- a/libcxx/include/__functional_base
+++ b/libcxx/include/__functional_base
@@ -70,7 +70,9 @@ struct _LIBCPP_TYPE_VIS_ONLY less<void>
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); }
+ _NOEXCEPT_(noexcept(_VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u)))
+ -> decltype (_VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u))
+ { return _VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u); }
typedef void is_transparent;
};
#endif
OpenPOWER on IntegriCloud