diff options
| author | dim <dim@FreeBSD.org> | 2014-03-05 20:01:04 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-03-05 20:01:04 +0000 |
| commit | 79abbab7d9cf9ccc108ac4b324655e53e15eece5 (patch) | |
| tree | 332dcd4a2912b85e82106c82ddb1658530e28ae8 /contrib/libc++ | |
| parent | 453f59d0c8b88a6478d5cf83a54775955fc836f1 (diff) | |
| download | FreeBSD-src-79abbab7d9cf9ccc108ac4b324655e53e15eece5.zip FreeBSD-src-79abbab7d9cf9ccc108ac4b324655e53e15eece5.tar.gz | |
Pull in r199848 from upstream libc++ trunk:
Const qualify __mem_fn call operator
QOI improvement.
Differential Revision: http://llvm-reviews.chandlerc.com/D2059
This should help with building recent versions of Mesa. See also:
https://bugs.freedesktop.org/show_bug.cgi?id=75505
Reported by: dumbbell
MFC after: 3 days
Diffstat (limited to 'contrib/libc++')
| -rw-r--r-- | contrib/libc++/include/__functional_03 | 8 | ||||
| -rw-r--r-- | contrib/libc++/include/functional | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libc++/include/__functional_03 b/contrib/libc++/include/__functional_03 index f9a3d97..2582601 100644 --- a/contrib/libc++/include/__functional_03 +++ b/contrib/libc++/include/__functional_03 @@ -33,28 +33,28 @@ public: // invoke typename __invoke_return<type>::type - operator() () + operator() () const { return __invoke(__f_); } template <class _A0> typename __invoke_return0<type, _A0>::type - operator() (_A0& __a0) + operator() (_A0& __a0) const { return __invoke(__f_, __a0); } template <class _A0, class _A1> typename __invoke_return1<type, _A0, _A1>::type - operator() (_A0& __a0, _A1& __a1) + operator() (_A0& __a0, _A1& __a1) const { return __invoke(__f_, __a0, __a1); } template <class _A0, class _A1, class _A2> typename __invoke_return2<type, _A0, _A1, _A2>::type - operator() (_A0& __a0, _A1& __a1, _A2& __a2) + operator() (_A0& __a0, _A1& __a1, _A2& __a2) const { return __invoke(__f_, __a0, __a1, __a2); } diff --git a/contrib/libc++/include/functional b/contrib/libc++/include/functional index d40f70a..891ed46 100644 --- a/contrib/libc++/include/functional +++ b/contrib/libc++/include/functional @@ -1221,7 +1221,7 @@ public: template <class... _ArgTypes> _LIBCPP_INLINE_VISIBILITY typename __invoke_return<type, _ArgTypes...>::type - operator() (_ArgTypes&&... __args) + operator() (_ArgTypes&&... __args) const { return __invoke(__f_, _VSTD::forward<_ArgTypes>(__args)...); } |
