aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorMike Stump <mrs@apple.com>2006-05-19 20:08:01 +0000
committerMike Stump <mrs@gcc.gnu.org>2006-05-19 20:08:01 +0000
commitd593cb3da7ebc6246c3da0ef3b46292b20d9f233 (patch)
tree8c423203590ab2dde81882d0d2b75e6e0a3a648b /gcc/cp
parent59fc0cc793a1b507424ba90a56fa33501c668e5d (diff)
downloadgcc-d593cb3da7ebc6246c3da0ef3b46292b20d9f233.zip
gcc-d593cb3da7ebc6246c3da0ef3b46292b20d9f233.tar.gz
gcc-d593cb3da7ebc6246c3da0ef3b46292b20d9f233.tar.bz2
c-tree.h (default_conversion): Remove.
* c-tree.h (default_conversion): Remove. * c-common.h (default_conversion): Add. cp: * typeck.c (default_conversion): Remove static. From-SVN: r113914
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 4308862..9720952 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-19 Mike Stump <mrs@apple.com>
+
+ * typeck.c (default_conversion): Remove static.
+
2006-05-19 Mark Mitchell <mark@codesourcery.com>
PR c++/26433
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index e275f76..93d6c22 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1540,7 +1540,7 @@ decay_conversion (tree exp)
applied to both operands to a binary operator before determining
what additional conversions should apply. */
-static tree
+tree
default_conversion (tree exp)
{
/* Perform the integral promotions first so that bitfield