typeck.c (string_conv_p): Use same_type_p to check whether we try to convert…

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

typeck.c (string_conv_p): Use same_type_p to check whether we try to convert…
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
6e176bd6 · Martin v. Löwis · Martin v. Löwis · 891febc6 · 6e176bd6 · 6e176bd6
Commit 6e176bd6 authored May 03, 1999 by Martin v. Löwis Committed by Martin v. Löwis May 03, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

gcc/cp/ChangeLog
+5 -0

gcc/cp/typeck.c
+1 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+1999-05-04  Martin von Lwis  <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

--- 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