diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cxx-pretty-print.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 072cda0..5275eca 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2010-05-21 Joseph Myers <joseph@codesourcery.com> + * cxx-pretty-print.c: Correct merge error. + +2010-05-21 Joseph Myers <joseph@codesourcery.com> + * error.c: Include tree-diagnostic.h and tree-pretty-print.h. (cp_print_error_function): Use diagnostic_abstract_origin macro. (cp_printer): Handle %K here using percent_K_format. diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 803257d..04a8314 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -24,9 +24,9 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "intl.h" -#include "tree-pretty-print.h" #include "cp-tree.h" #include "cxx-pretty-print.h" +#include "tree-pretty-print.h" #include "toplev.h" /* Translate if being used for diagnostics, but not for dump files or |