diff options
author | Nicola Pero <nicola.pero@meta-innovation.com> | 2011-02-23 10:57:59 +0000 |
---|---|---|
committer | Nicola Pero <nicola@gcc.gnu.org> | 2011-02-23 10:57:59 +0000 |
commit | 79d822528c732a292ec9974a2ffacdb0dc6db79f (patch) | |
tree | 00d37a8caa57c4cada7e20a68cfc6490ccfee7c6 /gcc/objc/objc-act.c | |
parent | 21e1e594a965e3742aca387b0f76e4bcbb19c64c (diff) | |
download | gcc-79d822528c732a292ec9974a2ffacdb0dc6db79f.zip gcc-79d822528c732a292ec9974a2ffacdb0dc6db79f.tar.gz gcc-79d822528c732a292ec9974a2ffacdb0dc6db79f.tar.bz2 |
Removed conflict in usage of TYPE_LANG_SLOT_0 between Objective-C and C
From-SVN: r170436
Diffstat (limited to 'gcc/objc/objc-act.c')
-rw-r--r-- | gcc/objc/objc-act.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 85ef8fb..049dc00 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -4203,9 +4203,6 @@ build_private_template (tree klass) /* Copy the attributes from the class to the type. */ if (TREE_DEPRECATED (klass)) TREE_DEPRECATED (record) = 1; - - if (CLASS_HAS_EXCEPTION_ATTR (klass)) - CLASS_HAS_EXCEPTION_ATTR (record) = 1; } } |