From: Nicola Pero <nicola.pero@meta-innovation.com>
Date: Thu, 7 Oct 2010 22:26:43 +0000 (+0000)
Subject: In gcc/testsuite/: 2010-10-07 Nicola Pero <nicola.pero@meta-innovation.com>
X-Git-Tag: releases/gcc-4.6.0~3768
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fb996b6d25fc277bc585e1a635c6e6c84492737;p=thirdparty%2Fgcc.git

In gcc/testsuite/: 2010-10-07 Nicola Pero <nicola.pero@meta-innovation.com>

In gcc/testsuite/:
2010-10-07  Nicola Pero  <nicola.pero@meta-innovation.com>

       PR objc++/23614
       * obj-c++.dg/lookup-2.mm: Do not assign 'nil' to a pointer to a
       C++ class.  Removed XFAIL.

From-SVN: r165137
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b68689c2a6d8..325ef7640fd7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	PR objc++/23614
+	* obj-c++.dg/lookup-2.mm: Do not assign 'nil' to a pointer to a
+	C++ class.  Removed XFAIL.
+
 2010-10-07  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/45933
diff --git a/gcc/testsuite/obj-c++.dg/lookup-2.mm b/gcc/testsuite/obj-c++.dg/lookup-2.mm
index 4d56cf25c14c..5eaf38996de2 100644
--- a/gcc/testsuite/obj-c++.dg/lookup-2.mm
+++ b/gcc/testsuite/obj-c++.dg/lookup-2.mm
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-xfail-if "PR23614" { "*-*-*" } { "*" } { "-fnext-runtime" } } */
 /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */
 #include "../objc-obj-c++-shared/Object1.h"
 #include <stdlib.h>
@@ -38,7 +37,7 @@ MyWidget gWidget;
 @implementation Container
 + (MyWidget *)elementForView:(Foo *)view
 {
-    MyWidget *widget = nil;
+    MyWidget *widget = 0;
     if ([view conformsTo:@protocol(MyProto)]) {
         widget = [(Foo <MyProto> *)view widget];
     }