87 Cygnus<->FSF merge

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@12425 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/cp-tree.def b/gcc/cp/cp-tree.def
index 63a9355..f0c4cf9 100644 (file)
--- a/gcc/cp/cp-tree.def
+++ b/gcc/cp/cp-tree.def
@@ -114,6 +114,9 @@ DEFTREECODE (LOOKUP_EXPR, "lookup_expr", "e", 2)
 DEFTREECODE (MODOP_EXPR, "modop_expr", "e", 3)
 DEFTREECODE (CAST_EXPR, "cast_expr", "1", 1)
 DEFTREECODE (REINTERPRET_CAST_EXPR, "reinterpret_cast_expr", "1", 1)
+DEFTREECODE (CONST_CAST_EXPR, "const_cast_expr", "1", 1)
+DEFTREECODE (STATIC_CAST_EXPR, "static_cast_expr", "1", 1)
+DEFTREECODE (DYNAMIC_CAST_EXPR, "dynamic_cast_expr", "1", 1)
 DEFTREECODE (SIZEOF_EXPR, "sizeof_expr", "1", 1)
 DEFTREECODE (ARROW_EXPR, "arrow_expr", "e", 1)
 DEFTREECODE (DOTSTAR_EXPR, "dotstar_expr", "e", 2)
@@ -134,3 +137,13 @@ DEFTREECODE (GOTO_STMT, "goto_stmt", "e", 1)
 DEFTREECODE (CTOR_INITIALIZER, "ctor_initializer", "e", 2)
 DEFTREECODE (CASE_LABEL, "case_label", "e", 2)
 DEFTREECODE (RETURN_INIT, "return_init", "e", 2)
+
+DEFTREECODE (EXACT_CONV, "exact_conv", "e", 1)
+DEFTREECODE (LVALUE_CONV, "lvalue_conv", "e", 1)
+DEFTREECODE (QUAL_CONV, "qual_conv", "e", 1)
+DEFTREECODE (STD_CONV, "std_conv", "e", 1)
+DEFTREECODE (PTR_CONV, "ptr_conv", "e", 1)
+DEFTREECODE (PMEM_CONV, "pmem_conv", "e", 1)
+DEFTREECODE (BASE_CONV, "base_conv", "e", 1)
+DEFTREECODE (REF_BIND, "ref_bind", "e", 1)
+DEFTREECODE (USER_CONV, "user_conv", "e", 4)