svn commit: r262956 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include

[Dimitry Andric]

Author: dim
Date: Sun Mar  9 21:02:23 2014
New Revision: 262956
URL: http://svnweb.freebsd.org/changeset/base/262956

Log:
  MFC r262805:
  
  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

Modified:
  stable/10/contrib/libc++/include/__functional_03
  stable/10/contrib/libc++/include/functional
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/contrib/libc++/include/__functional_03
  stable/9/contrib/libc++/include/functional
Directory Properties:
  stable/9/contrib/libc++/   (props changed)

Modified: stable/10/contrib/libc++/include/__functional_03
==============================================================================
--- stable/10/contrib/libc++/include/__functional_03	Sun Mar  9 20:51:14 2014	(r262955)
+++ stable/10/contrib/libc++/include/__functional_03	Sun Mar  9 21:02:23 2014	(r262956)
@@ -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);
           }

Modified: stable/10/contrib/libc++/include/functional
==============================================================================
--- stable/10/contrib/libc++/include/functional	Sun Mar  9 20:51:14 2014	(r262955)
+++ stable/10/contrib/libc++/include/functional	Sun Mar  9 21:02:23 2014	(r262956)
@@ -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)...);
           }