diff options
| author | Martin v. Löwis <loewis@informatik.hu-berlin.de> | 1999-05-03 23:57:18 +0000 |
|---|---|---|
| committer | Martin v. Löwis <loewis@gcc.gnu.org> | 1999-05-03 23:57:18 +0000 |
| commit | 6e176bd6829e93776ba37ead39adc21c8a30ce6d (patch) | |
| tree | c580cfd939f22a53616b95eeca4e827a5fc3965d | |
| parent | 891febc6e14802e97ea9bee618c28e04ddbea155 (diff) | |
| download | gcc-6e176bd6829e93776ba37ead39adc21c8a30ce6d.zip gcc-6e176bd6829e93776ba37ead39adc21c8a30ce6d.tar.gz gcc-6e176bd6829e93776ba37ead39adc21c8a30ce6d.tar.bz2 | |
typeck.c (string_conv_p): Use same_type_p to check whether we try to convert between char and wchar_t.
* typeck.c (string_conv_p): Use same_type_p to check whether we
try to convert between char and wchar_t.
From-SVN: r26764
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4c85517..59c4a68 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-05-04 Martin von Löwis <loewis@informatik.hu-berlin.de> + + * typeck.c (string_conv_p): Use same_type_p to check whether we + try to convert between char and wchar_t. + 1999-05-03 Mark Mitchell <mark@codesourcery.com> * search.c (lookup_field_r): Set the TREE_TYPE of an ambiguous diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index d65479b..fd02051 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1886,7 +1886,7 @@ string_conv_p (totype, exp, warn) if (TREE_CODE (exp) == STRING_CST) { /* Make sure that we don't try to convert between char and wchar_t. */ - if (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (exp))) != t) + if (!same_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (exp))), t)) return 0; } else |