git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cp-tree.h (cp_cpp_error), [...]): Take va_list* parameter. 

gcc/cp:
	* cp-tree.h (cp_cpp_error), error.c (cp_cpp_error): Take va_list*
	parameter.

libcpp:
	* include/cpplib.h (struct cpp_callbacks): Make error take
	va_list* parameter.
	* errors.c (cpp_error): Update call to callback.

From-SVN: r106466
This commit is contained in:
Joseph Myers 2005-11-04 01:16:32 +00:00 committed by Joseph Myers
parent 651ed94280
commit a63607ed43
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-04 Joseph S. Myers <joseph@codesourcery.com>
* cp-tree.h (cp_cpp_error), error.c (cp_cpp_error): Take va_list*
parameter.
2005-11-03 Joseph S. Myers <joseph@codesourcery.com> 2005-11-03 Joseph S. Myers <joseph@codesourcery.com>
PR c++/17964 PR c++/17964

2
gcc/cp/cp-tree.h
View File

@ -4438,7 +4438,7 @@ extern void cp_genericize (tree);
#define ATTRIBUTE_GCC_CXXDIAG(m, n) ATTRIBUTE_NONNULL(m) #define ATTRIBUTE_GCC_CXXDIAG(m, n) ATTRIBUTE_NONNULL(m)
#endif #endif
extern void cp_cpp_error (cpp_reader *, int, extern void cp_cpp_error (cpp_reader *, int,
const char *, va_list) const char *, va_list *)
ATTRIBUTE_GCC_CXXDIAG(3,0); ATTRIBUTE_GCC_CXXDIAG(3,0);
#endif /* ! GCC_CP_TREE_H */ #endif /* ! GCC_CP_TREE_H */

4
gcc/cp/error.c
View File

@ -2334,7 +2334,7 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec,
void void
cp_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, cp_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level,
const char *msg, va_list ap) const char *msg, va_list *ap)
{ {
diagnostic_info diagnostic; diagnostic_info diagnostic;
diagnostic_t dlevel; diagnostic_t dlevel;
@ -2356,7 +2356,7 @@ cp_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level,
default: default:
gcc_unreachable (); gcc_unreachable ();
} }
diagnostic_set_info_translated (&diagnostic, msg, &ap, diagnostic_set_info_translated (&diagnostic, msg, ap,
input_location, dlevel); input_location, dlevel);
report_diagnostic (&diagnostic); report_diagnostic (&diagnostic);
} }

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-04 Joseph S. Myers <joseph@codesourcery.com>
* include/cpplib.h (struct cpp_callbacks): Make error take
va_list* parameter.
* errors.c (cpp_error): Update call to callback.
2005-11-03 Andrew Pinski <pinskia@physics.uc.edu> 2005-11-03 Andrew Pinski <pinskia@physics.uc.edu>
PR preprocessor/22042 PR preprocessor/22042

2
libcpp/errors.c
View File

@ -141,7 +141,7 @@ cpp_error (cpp_reader * pfile, int level, const char *msgid, ...)
va_start (ap, msgid); va_start (ap, msgid);
if (CPP_OPTION (pfile, client_diagnostic)) if (CPP_OPTION (pfile, client_diagnostic))
pfile->cb.error (pfile, level, _(msgid), ap); pfile->cb.error (pfile, level, _(msgid), &ap);
else else
{ {
if (CPP_OPTION (pfile, traditional)) if (CPP_OPTION (pfile, traditional))

2
libcpp/include/cpplib.h
View File

@ -473,7 +473,7 @@ struct cpp_callbacks
/* Called to emit a diagnostic if client_diagnostic option is true. /* Called to emit a diagnostic if client_diagnostic option is true.
This callback receives the translated message. */ This callback receives the translated message. */
void (*error) (cpp_reader *, int, const char *, va_list) void (*error) (cpp_reader *, int, const char *, va_list *)
ATTRIBUTE_PRINTF(3,0); ATTRIBUTE_PRINTF(3,0);
}; };