* decl.c (grokfndecl): Set DECL_CONTEXT for static functions too.

From-SVN: r34742

* decl.c (grokfndecl): Set DECL_CONTEXT for static functions too.
From-SVN: r34742
adae082f · Mark Mitchell · Mark Mitchell · 49199692 · adae082f · adae082f
Commit adae082f authored Jun 27, 2000 by Mark Mitchell Committed by Mark Mitchell Jun 27, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/decl.c
+1 -1

gcc/testsuite/g++.old-deja/g++.ns/ns19.C
+7 -0

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2000-06-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* decl.c (grokfndecl): Set DECL_CONTEXT for static functions too.
+
 2000-06-26  Nathan Sidwell  <nathan@codesourcery.com>

 	* search.c (hides): Remove.

--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8862,7 +8862,7 @@ grokfndecl (ctype, type, declarator, orig_declarator, virtualp, flags, quals,
  /* If this decl has namespace scope, set that up.  */
  if (in_namespace)
    set_decl_namespace (decl, in_namespace, friendp);
-  else if (publicp && ! ctype)
+  else if (!ctype)
    DECL_CONTEXT (decl) = FROB_CONTEXT (current_namespace);

  /* `main' and builtins have implicit 'C' linkage.  */

--- a/gcc/testsuite/g++.old-deja/g++.ns/ns19.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/ns19.C
+// Build don't link:
+// Origin: Chip Salzenberg <chip@valinux.com>
+
+namespace N {
+enum { E = 0 };
+static int f() { return E; }
+}