aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <merrill@gnu.org>1994-10-15 00:32:58 +0000
committerJason Merrill <merrill@gnu.org>1994-10-15 00:32:58 +0000
commitfffba94c902cc169bc55e4c923ba04d42fb8d8b0 (patch)
tree001c6a4a2cc94bf1eca747cab15b60a18bb076d7
parent2f4f907dcc3ed2d0e2fab06b286ad57e09621f81 (diff)
downloadgcc-fffba94c902cc169bc55e4c923ba04d42fb8d8b0.zip
gcc-fffba94c902cc169bc55e4c923ba04d42fb8d8b0.tar.gz
gcc-fffba94c902cc169bc55e4c923ba04d42fb8d8b0.tar.bz2
(default_conversion): Don't expect type_promotes_to to
return a main variant. From-SVN: r8276
-rw-r--r--gcc/cp/typeck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 21ae121..cdf4066 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1306,7 +1306,7 @@ default_conversion (exp)
if (INTEGRAL_CODE_P (code))
{
tree t = type_promotes_to (type);
- if (t != TYPE_MAIN_VARIANT (type))
+ if (t != type)
return convert (t, exp);
}
if (flag_traditional