commit a64f2fbc09cae6d58a4b944e475f40ec491c0a26
author Marshall Clow <mclow.lists@gmail.com> Wed Feb 25 12:20:52 2015 +0000
committer Marshall Clow <mclow.lists@gmail.com> Wed Feb 25 12:20:52 2015 +0000
tree 6f7308b83297c69009aa80c4ce5bbb839de89e41
parent ca0bbff3a70b0a2dde3426af546b01f93cf2f166

Add trailing return types (and noexcept specifications) to the 'diamond operators'. Fixes PR#22600.

llvm-svn: 230484

libcxx/include/__functional_base

diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base
index e174e0c..09424bc 100644
--- a/libcxx/include/__functional_base
+++ b/libcxx/include/__functional_base
@@ -70,7 +70,9 @@
     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