From: Nathan Froyd <froydnj@codesourcery.com>
Date: Fri, 10 Dec 2010 16:06:30 +0000 (+0000)
Subject: decl.c (grokmethod): Test DECL_CLASS_SCOPE_P.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f701cc10784bd46461918119f93f5d5c28423fc;p=gcc.git

decl.c (grokmethod): Test DECL_CLASS_SCOPE_P.

	* decl.c (grokmethod): Test DECL_CLASS_SCOPE_P.
	* error.c (dump_decl): Test DECL_FILE_SCOPE_P.

From-SVN: r167691
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index de7160fd469..4b060564412 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-10  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* decl.c (grokmethod): Test DECL_CLASS_SCOPE_P.
+	* error.c (dump_decl): Test DECL_FILE_SCOPE_P.
+
 2010-12-10  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* cp-tree.h (readonly_error_kind): Delete.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b72b5884b7c..b75a13e2de3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -13098,8 +13098,7 @@ grokmethod (cp_decl_specifier_seq *declspecs,
 
   if (DECL_IN_AGGR_P (fndecl))
     {
-      if (DECL_CONTEXT (fndecl)
-	  && TREE_CODE (DECL_CONTEXT (fndecl)) != NAMESPACE_DECL)
+      if (DECL_CLASS_SCOPE_P (fndecl))
 	error ("%qD is already defined in class %qT", fndecl,
 	       DECL_CONTEXT (fndecl));
       return error_mark_node;
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 4fb47dc3b17..e1bac244418 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1027,7 +1027,7 @@ dump_decl (tree t, int flags)
 	      dump_type (DECL_CONTEXT (t), flags);
 	      pp_cxx_colon_colon (cxx_pp);
 	    }
-	  else if (DECL_CONTEXT (t))
+	  else if (!DECL_FILE_SCOPE_P (t))
 	    {
 	      dump_decl (DECL_CONTEXT (t), flags);
 	      pp_cxx_colon_colon (cxx_pp);