summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-15 14:30:21 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-15 14:30:21 +0000
commit25c7141ce542fe45b7cf162c683741cb6d24b81c (patch)
tree42976410dfe1c0328a7670437066c3cfb69f20bc /gcc/cp
parenta1c3b0e9acc1e9527870b019f22ecf81f03ece8c (diff)
downloadgcc-25c7141ce542fe45b7cf162c683741cb6d24b81c.tar.gz
2004-10-13 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/16301 * name-lookup.c (parse_using_directive): If we have a error_mark_node, do not set the decl namespace associations on it. 2004-10-14 Andrew Pinski <pinskia@physics.uc.edu> PR c++/16301 * g++.dg/lookup/strong-using-4.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89093 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/name-lookup.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8ae05c0e4ec..d970b5a5ea9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-13 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR c++/16301
+ * name-lookup.c (parse_using_directive): If we have a
+ error_mark_node, do not set the decl namespace associations
+ on it.
+
2004-10-14 Mark Mitchell <mark@codesourcery.com>
PR c++/17976
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index b7e29aa55d3..6634f870146 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -3422,7 +3422,7 @@ parse_using_directive (tree namespace, tree attribs)
{
if (!toplevel_bindings_p ())
error ("strong using only meaningful at namespace scope");
- else
+ else if (namespace != error_mark_node)
DECL_NAMESPACE_ASSOCIATIONS (namespace)
= tree_cons (current_namespace, 0,
DECL_NAMESPACE_ASSOCIATIONS (namespace));