commit d79b5a85b059239f8af69c009a78ab10f49af2be
author Mike Stump <mrs@apple.com> Tue Apr 21 22:51:42 2009 +0000
committer Mike Stump <mrs@apple.com> Tue Apr 21 22:51:42 2009 +0000
tree 8da9730bd48a55c899bd2060cc162fa1c4e684d1
parent 195e9c5d18a6f70f542522a8527af464f08db30c

Tighten up blocks type checking.  This was discussed back in the
r56595 timeframe, but left undone.  Radar 6812711

llvm-svn: 69745

clang/lib/Sema/SemaExpr.cpp

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index fa85757..81bac66 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -4894,7 +4894,7 @@
     DiagKind = diag::err_int_to_block_pointer;
     break;
   case IncompatibleBlockPointer:
-    DiagKind = diag::ext_typecheck_convert_incompatible_block_pointer;
+    DiagKind = diag::err_typecheck_convert_incompatible_block_pointer;
     break;
   case IncompatibleObjCQualifiedId:
     // FIXME: Diagnose the problem in ObjCQualifiedIdTypesAreCompatible, since