diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-12 08:45:27 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-12 08:45:27 +0000 |
| commit | 6b2e6e3347b155a61200ebed36ec53b5043c98bf (patch) | |
| tree | ee66bf6f85df2b3be6eff488406f296b98a0eafa /gcc/cp/parser.c | |
| parent | bce49ba48eac50ef8a5b06cd5d57db9bb99570f2 (diff) | |
| download | gcc-6b2e6e3347b155a61200ebed36ec53b5043c98bf.tar.gz | |
2012-11-12 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 193426 using svnmerge.py
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@193427 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f2642aba33a..7107134639e 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -24650,7 +24650,7 @@ cp_parser_objc_class_ivars (cp_parser* parser) if (decl_spec_seq_has_spec_p (&declspecs, ds_typedef)) { cp_parser_error (parser, "invalid type for instance variable"); - declspecs.locations[ds_thread] = 0; + declspecs.locations[ds_typedef] = 0; } prefix_attributes = declspecs.attributes; |