call.c (build_scoped_method_call): Fix thinko.

	* call.c (build_scoped_method_call): Fix thinko.
	(build_method_call): Likewise.

From-SVN: r20411

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fc4dca71fbd318b6720e070b331508b4deb4cad8..d2645529501e016419abf816cb76ffdcce93e955 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-10  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * call.c (build_scoped_method_call): Fix thinko.
+       (build_method_call): Likewise.
+
 1998-06-10  Dave Brolley  <brolley@cygnus.com>
 
        * decl2.c (lang_decode_option): New argc/argv interface.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 7a74213bc21929f9c672261cdea7c8b4ae8faf58..3a82b309f16b677698fc4c6949d1d78a564b5d83 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -397,7 +397,7 @@ build_scoped_method_call (exp, basetype, name, parms)
        /* OK */;
       else if (TREE_CODE (tmp) == IDENTIFIER_NODE)
        {
-         if (IS_AGGR_TYPE (basetype) && tmp == constructor_name (basetype))
+         if (IS_AGGR_TYPE (basetype) && name == constructor_name (basetype))
            tmp = basetype;
          else
            tmp = get_type_value (tmp);
@@ -662,7 +662,7 @@ build_method_call (instance, name, parms, basetype_path, flags)
        tmp = name;
       else if (TREE_CODE (name) == IDENTIFIER_NODE)
        {
-         if (IS_AGGR_TYPE (basetype) && tmp == constructor_name (basetype))
+         if (IS_AGGR_TYPE (basetype) && name == constructor_name (basetype))
            tmp = basetype;
          else
            tmp = get_type_value (tmp);