diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-13 14:13:19 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-13 14:13:19 +0000 |
| commit | ef6f748f9b28459bd27e09edecca6eeaf42f3df7 (patch) | |
| tree | a093e47020ed740781ff421875451b061f428494 /gcc/cp/decl2.c | |
| parent | 2466cdbf4be6dc8d97082310f02f72f905a6c420 (diff) | |
| download | gcc-ef6f748f9b28459bd27e09edecca6eeaf42f3df7.tar.gz | |
2012-06-13 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 188512 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@188515 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/decl2.c')
| -rw-r--r-- | gcc/cp/decl2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 78e17af61a4..2e3c9a63362 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -770,7 +770,9 @@ finish_static_data_member_decl (tree decl, if (! processing_template_decl) VEC_safe_push (tree, gc, pending_statics, decl); - if (LOCAL_CLASS_P (current_class_type)) + if (LOCAL_CLASS_P (current_class_type) + /* We already complained about the template definition. */ + && !DECL_TEMPLATE_INSTANTIATION (decl)) permerror (input_location, "local class %q#T shall not have static data member %q#D", current_class_type, decl); |