From: Alexandre Oliva <aoliva@redhat.com>
Date: Fri, 9 Jan 2004 21:30:31 +0000 (+0000)
Subject: name-lookup.c (qualified_lookup_using_namespace): Consider strong using directives... 
X-Git-Tag: releases/gcc-3.4.0~1162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c404ab029db3cf2b4980ce2adfde67c3ee6252e0;p=thirdparty%2Fgcc.git

name-lookup.c (qualified_lookup_using_namespace): Consider strong using directives even if we've already found a binding.

* name-lookup.c (qualified_lookup_using_namespace): Consider
strong using directives even if we've already found a binding.

From-SVN: r75599
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0c4ab8cb2c2e..bdbdd36389b2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* name-lookup.c (qualified_lookup_using_namespace): Consider
+	strong using directives even if we've already found a binding.
+
 2004-01-09  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (cxx_expand_expr): Change prototype.
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index a7888161d1a1..010bbe3989c6 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -1,5 +1,5 @@
 /* Definitions for C++ name lookup routines.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net>
 
 This file is part of GCC.
@@ -3789,14 +3789,19 @@ qualified_lookup_using_namespace (tree name, tree scope, cxx_binding *result,
       seen = tree_cons (scope, NULL_TREE, seen);
       if (binding)
         result = ambiguous_decl (name, result, binding, flags);
-      if (!result->value && !result->type)
-	/* Consider using directives.  */
-	for (usings = DECL_NAMESPACE_USING (scope); usings;
-	     usings = TREE_CHAIN (usings))
-	  /* If this was a real directive, and we have not seen it.  */
-	  if (!TREE_INDIRECT_USING (usings)
-	      && !purpose_member (TREE_PURPOSE (usings), seen))
-	    todo = tree_cons (TREE_PURPOSE (usings), NULL_TREE, todo);
+
+      /* Consider strong using directives always, and non-strong ones
+	 if we haven't found a binding yet.  ??? Shouldn't we consider
+	 non-strong ones if the initial RESULT is non-NULL, but the
+	 binding in the given namespace is?  */
+      for (usings = DECL_NAMESPACE_USING (scope); usings;
+	   usings = TREE_CHAIN (usings))
+	/* If this was a real directive, and we have not seen it.  */
+	if (!TREE_INDIRECT_USING (usings)
+	    && ((!result->value && !result->type)
+		|| is_associated_namespace (scope, TREE_PURPOSE (usings)))
+	    && !purpose_member (TREE_PURPOSE (usings), seen))
+	  todo = tree_cons (TREE_PURPOSE (usings), NULL_TREE, todo);
       if (todo)
 	{
 	  scope = TREE_PURPOSE (todo);