From owner-svn-src-all@FreeBSD.ORG  Wed Mar  5 20:01:05 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 38BE1247;
 Wed,  5 Mar 2014 20:01:05 +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 0C182825;
 Wed,  5 Mar 2014 20:01:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25K140G076136;
 Wed, 5 Mar 2014 20:01:04 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25K14rh076134;
 Wed, 5 Mar 2014 20:01:04 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403052001.s25K14rh076134@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 5 Mar 2014 20:01:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262805 - head/contrib/libc++/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Mar 2014 20:01:05 -0000

Author: dim
Date: Wed Mar  5 20:01:04 2014
New Revision: 262805
URL: http://svnweb.freebsd.org/changeset/base/262805

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

Modified:
  head/contrib/libc++/include/__functional_03
  head/contrib/libc++/include/functional

Modified: head/contrib/libc++/include/__functional_03
==============================================================================
--- head/contrib/libc++/include/__functional_03	Wed Mar  5 19:55:10 2014	(r262804)
+++ head/contrib/libc++/include/__functional_03	Wed Mar  5 20:01:04 2014	(r262805)
@@ -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: head/contrib/libc++/include/functional
==============================================================================
--- head/contrib/libc++/include/functional	Wed Mar  5 19:55:10 2014	(r262804)
+++ head/contrib/libc++/include/functional	Wed Mar  5 20:01:04 2014	(r262805)
@@ -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)...);
           }