aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorAndrew Pinski <pinskia@physics.uc.edu>2004-10-15 14:30:21 +0000
committerAndrew Pinski <pinskia@gcc.gnu.org>2004-10-15 07:30:21 -0700
commitdb3a95196c3192a488ad6ece2ea9057915d2c3a6 (patch)
tree42976410dfe1c0328a7670437066c3cfb69f20bc /gcc/cp
parentf0602b16b700a5fd705646b711b8a563c9c711cf (diff)
downloadgcc-db3a95196c3192a488ad6ece2ea9057915d2c3a6.zip
gcc-db3a95196c3192a488ad6ece2ea9057915d2c3a6.tar.gz
gcc-db3a95196c3192a488ad6ece2ea9057915d2c3a6.tar.bz2
[multiple changes]
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. From-SVN: r89093
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 8ae05c0..d970b5a 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 b7e29aa..6634f87 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));