From owner-svn-src-stable-10@FreeBSD.ORG  Sun Mar  9 21:02:25 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5EB793A1;
 Sun,  9 Mar 2014 21:02:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 30FA460E;
 Sun,  9 Mar 2014 21:02:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29L2PIu055850;
 Sun, 9 Mar 2014 21:02:25 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29L2OLR055848;
 Sun, 9 Mar 2014 21:02:24 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403092102.s29L2OLR055848@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 9 Mar 2014 21:02:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262956 - in stable: 10/contrib/libc++/include
 9/contrib/libc++/include
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2014 21:02:25 -0000

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)...);
           }