diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/jcf-io.c | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 0437f73..9ebc248 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2015-04-18 Trevor Saunders <tsaunders@mozilla.com> + + * jcf-io.c: Adjust for hash_table changes. + 2015-01-30 Joseph Myers <joseph@codesourcery.com> * class.c, expr.c, jcf-parse.c, jvspec.c: All callers of diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 2c48f14..36ceb07 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -285,21 +285,20 @@ find_classfile (char *filename, JCF *jcf, const char *dep_name) struct charstar_hash : typed_noop_remove <char> { - typedef const char value_type; - typedef const char compare_type; - static inline hashval_t hash (const value_type *candidate); - static inline bool equal (const value_type *existing, - const compare_type *candidate); + typedef const char *value_type; + typedef const char *compare_type; + static inline hashval_t hash (const char *candidate); + static inline bool equal (const char *existing, const char *candidate); }; inline hashval_t -charstar_hash::hash (const value_type *candidate) +charstar_hash::hash (const char *candidate) { return htab_hash_string (candidate); } inline bool -charstar_hash::equal (const value_type *existing, const compare_type *candidate) +charstar_hash::equal (const char *existing, const char *candidate) { return strcmp (existing, candidate) == 0; } |