From 8f0d6fd4283bbe2792949f144c66d38538f57ec4 Mon Sep 17 00:00:00 2001 From: mrs Date: Fri, 19 May 2006 20:08:01 +0000 Subject: * c-tree.h (default_conversion): Remove. * c-common.h (default_conversion): Add. cp: * typeck.c (default_conversion): Remove static. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113914 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/c-common.h | 5 +++++ gcc/c-tree.h | 1 - gcc/cp/ChangeLog | 4 ++++ gcc/cp/typeck.c | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f8a4de183c0..d92dfa29fd9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-05-19 Mike Stump + + * c-tree.h (default_conversion): Remove. + * c-common.h (default_conversion): Add. + 2006-05-19 Zdenek Dvorak * tree-vrp.c (valid_value_p): New function. diff --git a/gcc/c-common.h b/gcc/c-common.h index b26e811a902..014b0cacd05 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -760,6 +760,11 @@ extern tree build_unary_op (enum tree_code, tree, int); extern tree build_binary_op (enum tree_code, tree, tree, int); extern tree perform_integral_promotions (tree); +/* These functions must be defined by each front-end which implements + a variant of the C language. They are used by port files. */ + +extern tree default_conversion (tree); + /* Given two integer or real types, return the type for their sum. Given two compatible ANSI C types, returns the merged type. */ diff --git a/gcc/c-tree.h b/gcc/c-tree.h index 9b24daa79f5..3503c793a23 100644 --- a/gcc/c-tree.h +++ b/gcc/c-tree.h @@ -531,7 +531,6 @@ extern bool c_vla_type_p (tree); extern bool c_mark_addressable (tree); extern void c_incomplete_type_error (tree, tree); extern tree c_type_promotes_to (tree); -extern tree default_conversion (tree); extern struct c_expr default_function_array_conversion (struct c_expr); extern tree composite_type (tree, tree); extern tree build_component_ref (tree, tree); diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4308862680f..9720952fca0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2006-05-19 Mike Stump + + * typeck.c (default_conversion): Remove static. + 2006-05-19 Mark Mitchell PR c++/26433 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index e275f76a20f..93d6c22698f 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 -- cgit v1.2.1