From cbf0a8cc232ac278a84e97a2e3cf0e9bbce37f93 Mon Sep 17 00:00:00 2001 From: loewis Date: Sun, 18 Oct 1998 09:21:17 +0000 Subject: [PATCH] * decl2.c (validate_nonmember_using_decl): Fix using-directives of std if std is ignored. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23162 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl2.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5ccf3c1bf91..7b7740bba41 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1998-10-18 Martin von Löwis + + * decl2.c (validate_nonmember_using_decl): Fix using-directives of + std if std is ignored. + 1998-10-18 Jason Merrill * decl.c (grokvardecl): Fix thinko. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index b7dd7329c69..1a85dcbe304 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -4664,8 +4664,11 @@ validate_nonmember_using_decl (decl, scope, name) { if (TREE_CODE (decl) == SCOPE_REF && TREE_OPERAND (decl, 0) == std_node) - return NULL_TREE; - if (TREE_CODE (decl) == SCOPE_REF) + { + *scope = global_namespace; + *name = TREE_OPERAND (decl, 1); + } + else if (TREE_CODE (decl) == SCOPE_REF) { *scope = TREE_OPERAND (decl, 0); *name = TREE_OPERAND (decl, 1); -- 2.11.4.GIT