From owner-svn-src-head@FreeBSD.ORG  Fri Jun  1 06:50:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 655C21065670;
	Fri,  1 Jun 2012 06:50:38 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 50D7D8FC15;
	Fri,  1 Jun 2012 06:50:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q516oc8d093136;
	Fri, 1 Jun 2012 06:50:38 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q516ocOh093134;
	Fri, 1 Jun 2012 06:50:38 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201206010650.q516ocOh093134@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 1 Jun 2012 06:50:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236386 - head/contrib/llvm/tools/bugpoint
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jun 2012 06:50:38 -0000

Author: dim
Date: Fri Jun  1 06:50:37 2012
New Revision: 236386
URL: http://svn.freebsd.org/changeset/base/236386

Log:
  Pull in r155978 from upstream llvm trunk:
  
    Fix unintentional use of operator bool.
  
  This enables llvm's bugpoint tool to build with libc++.
  
  MFC after:	3 days

Modified:
  head/contrib/llvm/tools/bugpoint/ToolRunner.cpp

Modified: head/contrib/llvm/tools/bugpoint/ToolRunner.cpp
==============================================================================
--- head/contrib/llvm/tools/bugpoint/ToolRunner.cpp	Fri Jun  1 06:45:14 2012	(r236385)
+++ head/contrib/llvm/tools/bugpoint/ToolRunner.cpp	Fri Jun  1 06:50:37 2012	(r236386)
@@ -128,7 +128,7 @@ static int RunProgramRemotelyWithTimeout
       ErrorFile.close();
     }
 
-    errs() << OS;
+    errs() << OS.str();
   }
 
   return ReturnCode;