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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f8a4de183c054282fcd6ea8cba28bf08c901d24c..d92dfa29fd9ac5ae4391b3d6f39d8b9fc55c87c4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-19  Mike Stump  <mrs@apple.com>
+
+       * c-tree.h (default_conversion): Remove.
+       * c-common.h (default_conversion): Add.
+
 2006-05-19  Zdenek Dvorak <dvorakz@suse.cz>
 
        * tree-vrp.c (valid_value_p): New function.

diff --git a/gcc/c-common.h b/gcc/c-common.h
index b26e811a90230ecd360e4f9e13d27a9699b09ad4..014b0cacd0511637fe89f59e9b77d03920d49e23 100644 (file)
--- 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 9b24daa79f5fff13ab6d7dc2710d8c048f874efa..3503c793a231f82f3ff95350423b3ae390ecbeb3 100644 (file)
--- 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 4308862680fa8d486304eab92336c286da4b6077..9720952fca0d47623dd10e535ee620b45f308afd 100644 (file)
--- 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 e275f76a20f29ac1624623d4a368b4c8f17e5ece..93d6c22698fdd1f6e2f65c5c221fe6ceccbf4d0c 100644 (file)
--- 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