aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@integrable-solutions.net>2006-02-09 16:28:26 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2006-02-09 16:28:26 +0000
commitcfb10bd3bad0636ed13ee47ffa9571287ee2d8d8 (patch)
treeb179cc85dddedf0fe8e6f465783c974cde2e7b0a /gcc/cp
parentf9fa4363858bbe008735b45d15b0c031ce5ca08b (diff)
downloadgcc-cfb10bd3bad0636ed13ee47ffa9571287ee2d8d8.zip
gcc-cfb10bd3bad0636ed13ee47ffa9571287ee2d8d8.tar.gz
gcc-cfb10bd3bad0636ed13ee47ffa9571287ee2d8d8.tar.bz2
c-common.h (flag_const_strings): Don't declare.
2006-02-09 Gabriel Dos Reis <gdr@integrable-solutions.net> * c-common.h (flag_const_strings): Don't declare. * c-common.c (flag_const_strings): Remove. * c.opt (fconst_strings): Remove. * c-opts.c (c_common_handle_option): Remove * <OPT_fconst_strings>. <OPT_Wwrite_strings>: Don't set flag_const_strings. (c_common_init_options): Don't set flag_const_strings. * doc/invoke.texi (-fno-const-strings): Remove documentation. cp/ 2006-02-09 Gabriel Dos Reis <gdr@integrable-solutions.net> * typeck.c (string_conv_p): Don't test for flag_const_strings. testsuite/ 2006-02-09 Gabriel Dos Reis <gdr@integrable-solutions.net> * g++.old-deja/g++.benjamin/15351-2.C: Likewise. * g++.old-deja/g++.benjamin/15351-1.C: Remove. From-SVN: r110804
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/typeck.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 74071c9..e3ceaa2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-09 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * typeck.c (string_conv_p): Don't test for flag_const_strings.
+
2006-02-08 Jason Merrill <jason@redhat.com>
PR c++/25979
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index e8dac53..df4f6cc 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1472,7 +1472,7 @@ string_conv_p (tree totype, tree exp, int warn)
{
tree t;
- if (! flag_const_strings || TREE_CODE (totype) != POINTER_TYPE)
+ if (TREE_CODE (totype) != POINTER_TYPE)
return 0;
t = TREE_TYPE (totype);