decl.c (lookup_name_real): OK, do return the from_obj value unless got_object…

decl.c (lookup_name_real): OK, do return the from_obj value unless got_object depends on template parms.

	* decl.c (lookup_name_real): OK, do return the from_obj value
	unless got_object depends on template parms.

From-SVN: r21370

gcc/cp/ChangeLog

 1998-07-24  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* decl.c (lookup_name_real): OK, do return the from_obj value
+	unless got_object depends on template parms.
+
 	* parse.y (nested_name_specifier_1): Pull out the TYPE_MAIN_VARIANT.
 
 	* pt.c (coerce_template_parms): Also complain about local enums.

gcc/cp/decl.c

@@ -5085,8 +5085,11 @@ lookup_name_real (name, prefer_type, nonclass, namespaces_only)
 			  TREE_TYPE (val));
 	    }
 
-	  /* We don't change val to from_obj here because that breaks
-	     implicit typename for destructor calls.  */
+	  /* We don't change val to from_obj if got_object depends on
+	     template parms because that breaks implicit typename for
+	     destructor calls.  */
+	  if (! uses_template_parms (got_object))
+	    val = got_object;
 	}
 
       if ((TREE_CODE (val) == TEMPLATE_DECL && looking_for_template)