From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 21 Aug 2015 17:39:48 +0000 (+0000)
Subject: 2015-08-21  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53637344b33126600482b9c4141523b1046e2cf1;p=thirdparty%2Fgcc.git

2015-08-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokvardecl): Simplify the latter.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227078 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f8fae34b760a..bc613f088e1d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ab55e75f27ea..205febc1dad4 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.