diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2014-01-20 10:18:49 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2014-01-20 10:18:49 +0000 |
| commit | 621955cb7cc891dc7504523d7cac10e0ec8c17e7 (patch) | |
| tree | 00264271884cf814270e5051a50c69dd560ad839 | |
| parent | 0fabe5f34ff7f53f92f055aff02170ef6a305cac (diff) | |
| download | gcc-621955cb7cc891dc7504523d7cac10e0ec8c17e7.zip gcc-621955cb7cc891dc7504523d7cac10e0ec8c17e7.tar.gz gcc-621955cb7cc891dc7504523d7cac10e0ec8c17e7.tar.bz2 | |
c-ada-spec.h (dump_ada_specs): Revert prototype change.
c-family/
* c-ada-spec.h (dump_ada_specs): Revert prototype change.
* c-ada-spec.c (dump_ads): Likewise.
(cpp_check): Likewise.
(dump_ada_specs): Likewise.
cp/
* decl2.c (cpp_check): Revert prototype change.
From-SVN: r206793
| -rw-r--r-- | gcc/c-family/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/c-family/c-ada-spec.c | 10 | ||||
| -rw-r--r-- | gcc/c-family/c-ada-spec.h | 2 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 |
5 files changed, 19 insertions, 8 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index fede01f..3198558 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,4 +1,11 @@ -2014-01-15 Laurent Alfonsi <laurent.alfonsi@st.com> +2014-01-20 Eric Botcazou <ebotcazou@adacore.com> + + * c-ada-spec.h (dump_ada_specs): Revert prototype change. + * c-ada-spec.c (dump_ads): Likewise. + (cpp_check): Likewise. + (dump_ada_specs): Likewise. + +2014-01-15 Laurent Alfonsi <laurent.alfonsi@st.com> PR c++/49718 * c-common.c (handle_no_instrument_function_attribute): Allow diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c index df4a1f2..fc21b62 100644 --- a/gcc/c-family/c-ada-spec.c +++ b/gcc/c-family/c-ada-spec.c @@ -58,7 +58,7 @@ static void dump_ada_nodes (pretty_printer *, const char *); static void reset_ada_withs (void); static void dump_ada_withs (FILE *); static void dump_ads (const char *, void (*)(const char *), - int (*)(const_tree, cpp_operation)); + int (*)(tree, cpp_operation)); static char *to_ada_name (const char *, int *); static bool separate_class_package (tree); @@ -68,7 +68,7 @@ static bool separate_class_package (tree); #define INDENT_INCR 3 /* Global hook used to perform C++ queries on nodes. */ -static int (*cpp_check) (const_tree, cpp_operation) = NULL; +static int (*cpp_check) (tree, cpp_operation) = NULL; /* Given a cpp MACRO, compute the max length BUFFER_LEN of the macro, as well @@ -975,7 +975,7 @@ is_tagged_type (const_tree type) sufficiently simple. */ static bool -has_nontrivial_methods (const_tree type) +has_nontrivial_methods (tree type) { tree tmp; @@ -3263,7 +3263,7 @@ print_ada_struct_decl (pretty_printer *buffer, tree node, tree type, int spc, static void dump_ads (const char *source_file, void (*collect_all_refs)(const char *), - int (*check)(const_tree, cpp_operation)) + int (*check)(tree, cpp_operation)) { char *ads_name; char *pkg_name; @@ -3364,7 +3364,7 @@ collect_source_ref (const char *filename) void dump_ada_specs (void (*collect_all_refs)(const char *), - int (*check)(const_tree, cpp_operation)) + int (*check)(tree, cpp_operation)) { int i; diff --git a/gcc/c-family/c-ada-spec.h b/gcc/c-family/c-ada-spec.h index 3d1f165..7414c94 100644 --- a/gcc/c-family/c-ada-spec.h +++ b/gcc/c-family/c-ada-spec.h @@ -37,6 +37,6 @@ extern location_t decl_sloc (const_tree, bool); extern void collect_ada_nodes (tree, const char *); extern void collect_source_ref (const char *); extern void dump_ada_specs (void (*)(const char *), - int (*)(const_tree, cpp_operation)); + int (*)(tree, cpp_operation)); #endif /* ! C_ADA_SPEC_H */ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0508ea0..0b9c181 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2014-01-20 Eric Botcazou <ebotcazou@adacore.com> + + * decl2.c (cpp_check): Revert prototype change. + 2014-01-17 Paolo Carlini <paolo.carlini@oracle.com> PR c++/59270 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 8fa3037..58419ec 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3817,7 +3817,7 @@ build_java_method_aliases (struct pointer_set_t *candidates) /* Return C++ property of T, based on given operation OP. */ static int -cpp_check (const_tree t, cpp_operation op) +cpp_check (tree t, cpp_operation op) { switch (op) { |