summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-06-01 06:50:37 +0000
committerdim <dim@FreeBSD.org>2012-06-01 06:50:37 +0000
commit37d863747e7d834334cf5f938b385fa9f61f0c06 (patch)
tree54790a2d6db7dd69562b6516ff71d214751e9fe8
parent08b9bda694e2eef61c66a6165984a64681ee9831 (diff)
downloadFreeBSD-src-37d863747e7d834334cf5f938b385fa9f61f0c06.zip
FreeBSD-src-37d863747e7d834334cf5f938b385fa9f61f0c06.tar.gz
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
-rw-r--r--contrib/llvm/tools/bugpoint/ToolRunner.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/bugpoint/ToolRunner.cpp b/contrib/llvm/tools/bugpoint/ToolRunner.cpp
index 25a2bae..d975d68 100644
--- a/contrib/llvm/tools/bugpoint/ToolRunner.cpp
+++ b/contrib/llvm/tools/bugpoint/ToolRunner.cpp
@@ -128,7 +128,7 @@ static int RunProgramRemotelyWithTimeout(const sys::Path &RemoteClientPath,
ErrorFile.close();
}
- errs() << OS;
+ errs() << OS.str();
}
return ReturnCode;
OpenPOWER on IntegriCloud