[cfe-commits] r69748 - /cfe/trunk/test/Sema/block-misc.c

[Mike Stump]

Author: mrs
Date: Tue Apr 21 18:03:34 2009
New Revision: 69748

URL: http://llvm.org/viewvc/llvm-project?rev=69748&view=rev
Log:
Resolve merge conflict better.

Modified:
    cfe/trunk/test/Sema/block-misc.c

Modified: cfe/trunk/test/Sema/block-misc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/block-misc.c?rev=69748&r1=69747&r2=69748&view=diff

==============================================================================
--- cfe/trunk/test/Sema/block-misc.c (original)
+++ cfe/trunk/test/Sema/block-misc.c Tue Apr 21 18:03:34 2009
@@ -112,14 +112,9 @@
     ^{ break; }();     // expected-error {{'break' statement not in loop or switch statement}}
 }
 
-enum { LESS };
-
-void foo(long (^comp)()) {
-}
-
 void (^test12f)(void);
 void test12() {
-  foo(^{ return LESS; });	// expected-error {{incompatible block pointer types passing 'int (^)(void)', expected 'long (^)()'}}
+  test12f = ^test12f;	// expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
 }
 
 // rdar://6808730
@@ -142,7 +137,12 @@
   };
 }
 
-void (^test90f)(void);
-void test90() {
-  test90f = ^test90f;	// expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
+enum { LESS };
+
+void foo(long (^comp)()) {
+}
+
+void (^test15f)(void);
+void test15() {
+  foo(^{ return LESS; });	// expected-error {{incompatible block pointer types passing 'int (^)(void)', expected 'long (^)()'}}
 }