aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorVolker Reichelt <reichelt@igpm.rwth-aachen.de>2006-02-13 22:37:02 +0000
committerVolker Reichelt <reichelt@gcc.gnu.org>2006-02-13 22:37:02 +0000
commitae00383baa7b210ce5e74efead6ac22834ae927a (patch)
tree17f4b43b3cc2065140f0915a541e005daa40817f /gcc
parentaa9d8196d7b29a1213b48bc59ae50d36dd3765d2 (diff)
downloadgcc-ae00383baa7b210ce5e74efead6ac22834ae927a.zip
gcc-ae00383baa7b210ce5e74efead6ac22834ae927a.tar.gz
gcc-ae00383baa7b210ce5e74efead6ac22834ae927a.tar.bz2
cp-tree.h (build_type_conversion): Remove prototype.
* cp-tree.h (build_type_conversion): Remove prototype. * cvt.c (build_type_conversion): Add prototype, make static. From-SVN: r110935
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/cp-tree.h1
-rw-r--r--gcc/cp/cvt.c3
3 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9852864..8f4de4d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2006-02-13 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+ * cp-tree.h (build_type_conversion): Remove prototype.
+ * cvt.c (build_type_conversion): Add prototype, make static.
+
* cp-tree.h (push_tinst_level): Remove prototype.
(pop_tinst_level): Likewise.
* pt.c (push_tinst_level): Add prototype, make static.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index aa6876a..b102860 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3758,7 +3758,6 @@ extern tree ocp_convert (tree, tree, int, int);
extern tree cp_convert (tree, tree);
extern tree convert_to_void (tree, const char */*implicit context*/);
extern tree convert_force (tree, tree, int);
-extern tree build_type_conversion (tree, tree);
extern tree build_expr_type_conversion (int, tree, bool);
extern tree type_promotes_to (tree);
extern tree perform_qualification_conversions (tree, tree);
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 4dd1e10..abdb499 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -40,6 +40,7 @@ Boston, MA 02110-1301, USA. */
static tree cp_convert_to_pointer (tree, tree, bool);
static tree convert_to_pointer_force (tree, tree);
+static tree build_type_conversion (tree, tree);
static tree build_up_reference (tree, tree, int, tree);
static void warn_ref_binding (tree, tree, tree);
@@ -1035,7 +1036,7 @@ convert_force (tree type, tree expr, int convtype)
that doesn't do it. This will probably wait for an overloading rewrite.
(jason 8/9/95) */
-tree
+static tree
build_type_conversion (tree xtype, tree expr)
{
/* C++: check to see if we can convert this aggregate type