diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-26 14:57:54 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-26 14:57:54 +0000 |
| commit | 7bd935cdb41444ec4a53152aa230fc0262b63300 (patch) | |
| tree | d7287d5062e65d84edb3ab01ede335336b8b4c3b /gcc/cp/error.c | |
| parent | 41e69d7b0792fd347b35d4dce100655d1f1b0fbe (diff) | |
| download | gcc-7bd935cdb41444ec4a53152aa230fc0262b63300.tar.gz | |
[./]
2013-11-26 Basile Starynkevitch <basile@starynkevitch.net>
{{merge using svnmerge.py with trunk GCC 4.9 svn rev 205391 now in
stage 3; very unstable}}
[gcc/]
2013-11-26 Basile Starynkevitch <basile@starynkevitch.net>
{{unstable, xtramelt-ana-base.melt is not translatable. Merge with
trunk svn rev 205391}}
* melt-run.proto.h: Move MELT_GCC_VERSION #definition above.
Include basic-block.h, tree-ssa-alias.h, internal-fn.h,
gimple-expr.h, is-a.h for GCC 4.9...
* melt-runtime.cc: Include basic-block.h, tree-ssa-alias.h, internal-fn.h,
gimple-expr.h, is-a.h, pointer-set.h for GCC 4.9...
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@205393 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/error.c')
| -rw-r--r-- | gcc/cp/error.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 5481523868d..72aa936c129 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -924,7 +924,7 @@ dump_global_iord (cxx_pretty_printer *pp, tree t) else gcc_unreachable (); - pp_printf (pp, p, input_filename); + pp_printf (pp, p, LOCATION_FILE (input_location)); } static void @@ -2804,7 +2804,7 @@ location_of (tree t) if (DECL_P (t)) return DECL_SOURCE_LOCATION (t); - return EXPR_LOC_OR_HERE (t); + return EXPR_LOC_OR_LOC (t, input_location); } /* Now the interfaces from error et al to dump_type et al. Each takes an @@ -3463,7 +3463,7 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec, void maybe_warn_cpp0x (cpp0x_warn_str str) { - if ((cxx_dialect == cxx98) && !in_system_header) + if ((cxx_dialect == cxx98) && !in_system_header_at (input_location)) /* We really want to suppress this warning in system headers, because libstdc++ uses variadic templates even when we aren't in C++0x mode. */ |