From: froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 10 Dec 2010 16:06:30 +0000 (+0000)
Subject: 	* decl.c (grokmethod): Test DECL_CLASS_SCOPE_P.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4f83d180c3dcb193e4284b47ec01e614f89f3ad;p=thirdparty%2Fgcc.git

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


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index de7160fd469e..4b060564412c 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 b72b5884b7cb..b75a13e2de3f 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 4fb47dc3b176..e1bac244418f 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);