From c22de166bd6cf2938f0fce7a57e86f2e42dc6ce4 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 9 Aug 1999 04:46:20 -0400 Subject: [PATCH] revert: typeck.c (common_type): Use same_type_p. revert: * typeck.c (common_type): Use same_type_p. From-SVN: r28620 --- gcc/cp/ChangeLog | 4 ---- gcc/cp/typeck.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f45b354dbe7..ad9d0b21ab6c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,7 +1,3 @@ -1999-08-08 Jason Merrill - - * typeck.c (common_type): Use same_type_p. - 1999-08-06 Jason Merrill * 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 f1c8a1ff5a88..d0743e950f40 100644 --- 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) { -- 2.47.2