diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2015-08-21 17:39:48 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2015-08-21 17:39:48 +0000 |
| commit | d8f29cc0219c7f909f1a599d82f7f8e7985bbe17 (patch) | |
| tree | 15e59c11e5b403e47f192d4ad5a35ffdfd7d5757 | |
| parent | abe64d9ec49d7bd6735e4c303714297d28c09ad4 (diff) | |
| download | gcc-d8f29cc0219c7f909f1a599d82f7f8e7985bbe17.zip gcc-d8f29cc0219c7f909f1a599d82f7f8e7985bbe17.tar.gz gcc-d8f29cc0219c7f909f1a599d82f7f8e7985bbe17.tar.bz2 | |
decl.c (grokvardecl): Simplify the latter.
2015-08-21 Paolo Carlini <paolo.carlini@oracle.com>
* decl.c (grokvardecl): Simplify the latter.
From-SVN: r227078
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f8fae34..bc613f0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2015-08-21 Paolo Carlini <paolo.carlini@oracle.com> + * decl.c (grokvardecl): Simplify the latter. + +2015-08-21 Paolo Carlini <paolo.carlini@oracle.com> + * decl.c (grokvardecl): Complete check added for c++/67065. 2015-08-20 Jason Merrill <jason@redhat.com> diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index ab55e75..205febc 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8357,8 +8357,7 @@ grokvardecl (tree type, if (DECL_NAME (decl) && MAIN_NAME_P (DECL_NAME (decl)) - && CP_DECL_CONTEXT (decl) == global_namespace - && !at_function_scope_p ()) + && scope == global_namespace) error ("cannot declare %<::main%> to be a global variable"); /* Check that the variable can be safely declared as a concept. |