commit 5b5d21ea1aac8ca59905be31e76ccf9b912a8d5c
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Mar 12 23:36:42 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Mar 12 23:36:42 2014 +0000
tree 87b04152250e9251f4bbc97dcbe1622b783f74dd
parent 34ac9be1d7c60410cec282f0a26f63c2afae19ff

Only allow streaming exactly type 'bool' to a DiagnosticBuilder, not anything
that implicitly converts to 'bool' (such as pointers, and the first operand of
?:). Clean up issues found by this. Patch by Stephan Tolksdorf!

llvm-svn: 203735

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 027fd6f..c75bac5 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -6564,8 +6564,7 @@
     S.Diag(Loc, diag::warn_inline_namespace_reopened_noninline)
       << FixItHint::CreateInsertion(KeywordLoc, "inline ");
   else
-    S.Diag(Loc, diag::err_inline_namespace_mismatch)
-      << IsInline;
+    S.Diag(Loc, diag::err_inline_namespace_mismatch) << *IsInline;
 
   S.Diag(PrevNS->getLocation(), diag::note_previous_definition);
   *IsInline = PrevNS->isInline();