From: Mark Mitchell <mark@markmitchell.com>
Date: Mon, 8 Jun 1998 00:20:34 +0000 (+0000)
Subject: init.c (build_offset_ref): Correct previous change to use build, not build_min.
X-Git-Tag: prereleases/egcs-1.1-prerelease~886
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53b22f3db7f0546810d90a0577bfdb8913b1434a;p=thirdparty%2Fgcc.git

init.c (build_offset_ref): Correct previous change to use build, not build_min.

	* init.c (build_offset_ref): Correct previous change to use build,
	not build_min.

From-SVN: r20319
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 57ec88a2a4ca..07178e742ac5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-08  Mark Mitchell  <mark@markmitchell.com>
+
+	* init.c (build_offset_ref): Correct previous change to use build,
+	not build_min.
+
 1998-06-07  Mark Mitchell  <mark@markmitchell.com>
 
 	* class.c (instantiate_type): Handle pointer-to-members where the
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index b7b74c0ec96e..c9de4833db18 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1621,9 +1621,10 @@ build_offset_ref (type, name)
   if (type == std_node)
     return do_scoped_id (name, 0);
 
-  if (processing_template_decl || uses_template_parms (type)
-      || TREE_CODE (name) == TEMPLATE_ID_EXPR)
-    return build_min (SCOPE_REF, unknown_type_node, type, name);
+  if (processing_template_decl || uses_template_parms (type))
+    return build_min_nt (SCOPE_REF, type, name);
+  else if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
+    return build (SCOPE_REF, unknown_type_node, type, name);
 
   /* Handle namespace names fully here.  */
   if (TREE_CODE (type) == NAMESPACE_DECL)