diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-13 06:41:07 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-13 06:41:07 +0000 |
| commit | 4ee9c6840ad3fc92a9034343278a1e476ad6872a (patch) | |
| tree | a2568888a519c077427b133de9ece5879a8484a5 /gcc/cp/error.c | |
| parent | ebb338380ab170c91e64d38038e6b5ce930d69a1 (diff) | |
| download | gcc-4ee9c6840ad3fc92a9034343278a1e476ad6872a.tar.gz | |
Merge tree-ssa-20020619-branch into mainline.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81764 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/error.c')
| -rw-r--r-- | gcc/cp/error.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gcc/cp/error.c b/gcc/cp/error.c index e313c16f39d..6e186503bad 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -47,7 +47,7 @@ static cxx_pretty_printer scratch_pretty_printer; # define NEXT_CODE(T) (TREE_CODE (TREE_TYPE (T))) #define reinit_global_formatting_buffer() \ - output_clear_message_text (scratch_buffer) + pp_clear_output_area (scratch_buffer) static const char *args_to_string (tree, int); static const char *assop_to_string (enum tree_code); @@ -1604,10 +1604,6 @@ dump_expr (tree t, int flags) break; } - case EXPR_WITH_FILE_LOCATION: - dump_expr (EXPR_WFL_NODE (t), flags); - break; - case CONSTRUCTOR: if (TREE_TYPE (t) && TYPE_PTRMEMFUNC_P (TREE_TYPE (t))) { @@ -2191,8 +2187,7 @@ print_instantiation_full_context (diagnostic_context *context) decl_as_string (TINST_DECL (p), TFF_DECL_SPECIFIERS | TFF_RETURN_TYPE)); - location.line = TINST_LINE (p); - location.file = TINST_FILE (p); + location = *EXPR_LOCUS (p); p = TREE_CHAIN (p); } } @@ -2211,8 +2206,7 @@ print_instantiation_partial_context (diagnostic_context *context, loc.file, loc.line, decl_as_string (TINST_DECL (t), TFF_DECL_SPECIFIERS | TFF_RETURN_TYPE)); - loc.line = TINST_LINE (t); - loc.file = TINST_FILE (t); + loc = *EXPR_LOCUS (t); } pp_verbatim (context->printer, "%s:%d: instantiated from here\n", loc.file, loc.line); |