revert: typeck.c (common_type): Use same_type_p.

revert:
	* typeck.c (common_type): Use same_type_p.

From-SVN: r28620

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7f45b354dbe71d327f47d7ed7756a869264359a4..ad9d0b21ab6c656907be44d9ec2ce9998cd10073 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,7 +1,3 @@
-1999-08-08  Jason Merrill  <jason@yorick.cygnus.com>
-
-       * typeck.c (common_type): Use same_type_p.
-
 1999-08-06  Jason Merrill  <jason@yorick.cygnus.com>
 
        * pt.c (maybe_get_template_decl_from_type_decl): Make sure that

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index f1c8a1ff5a887545f6f519bc9492d4fad9117c44..d0743e950f40b2c56a8f69920a5e90a6feb389f2 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -582,7 +582,7 @@ common_type (t1, t2)
        tt1 = TYPE_MAIN_VARIANT (tt1);
        tt2 = TYPE_MAIN_VARIANT (tt2);
 
-       if (same_type_p (tt1, tt2))
+       if (tt1 == tt2)
          target = tt1;
        else if (b1)
          {