aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey A Law <law@cygnus.com>1998-03-29 12:31:34 +0000
committerJeff Law <law@gcc.gnu.org>1998-03-29 05:31:34 -0700
commit228fab4ab6fb94957fa4ae6755db1c5e0bf9a462 (patch)
tree1fe935fabce7e7b0bbebf8dece16762c43eb4272
parent00c493f2c2dc6f3baa2b309d2087f5ba8a05d01c (diff)
downloadgcc-228fab4ab6fb94957fa4ae6755db1c5e0bf9a462.zip
gcc-228fab4ab6fb94957fa4ae6755db1c5e0bf9a462.tar.gz
gcc-228fab4ab6fb94957fa4ae6755db1c5e0bf9a462.tar.bz2
* cvt.c (build_conversion_type_1): Delete dead function.
From-SVN: r18897
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/cvt.c38
2 files changed, 2 insertions, 38 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 138ac70..f732eed 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
Sun Mar 29 00:47:32 1998 Jeffrey A Law (law@cygnus.com)
+ * cvt.c (build_conversion_type_1): Delete dead function.
+
* cp-tree.h (push_expression_obstack): Declare.
* call.c (source_type): #if 0 out.
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index dfaee3c..7cd5f2e 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -41,8 +41,6 @@ extern tree static_aggregates;
static tree cp_convert_to_pointer PROTO((tree, tree));
static tree convert_to_pointer_force PROTO((tree, tree));
static tree build_up_reference PROTO((tree, tree, int, int));
-static tree build_type_conversion_1 PROTO((tree, tree, tree, tree,
- int));
/* Change of width--truncation and extension of integers or reals--
is represented with NOP_EXPR. Proper functioning of many things
@@ -902,42 +900,6 @@ convert_force (type, expr, convtype)
return ocp_convert (type, e, CONV_C_CAST|convtype, LOOKUP_NORMAL);
}
-/* Subroutine of build_type_conversion. */
-
-static tree
-build_type_conversion_1 (xtype, basetype, expr, typename, for_sure)
- tree xtype, basetype;
- tree expr;
- tree typename;
- int for_sure;
-{
- tree rval;
- int flags;
-
- if (for_sure == 0)
- flags = LOOKUP_PROTECT|LOOKUP_ONLYCONVERTING;
- else
- flags = LOOKUP_NORMAL|LOOKUP_ONLYCONVERTING;
-
- rval = build_method_call (expr, typename, NULL_TREE, NULL_TREE, flags);
- if (rval == error_mark_node)
- {
- if (for_sure == 0)
- return NULL_TREE;
- return error_mark_node;
- }
-
- if (IS_AGGR_TYPE (TREE_TYPE (rval)))
- return rval;
-
- if (warn_cast_qual
- && TREE_TYPE (xtype)
- && (TREE_READONLY (TREE_TYPE (TREE_TYPE (rval)))
- > TREE_READONLY (TREE_TYPE (xtype))))
- warning ("user-defined conversion casting away `const'");
- return cp_convert (xtype, rval);
-}
-
/* Convert an aggregate EXPR to type XTYPE. If a conversion
exists, return the attempted conversion. This may
return ERROR_MARK_NODE if the conversion is not