aboutsummaryrefslogtreecommitdiff
path: root/libjava/include/jvm.h
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-03-07 17:18:33 +0000
committerTom Tromey <tromey@gcc.gnu.org>2005-03-07 17:18:33 +0000
commit21b2340908ecd93806e3928ad3ceff208b2e0573 (patch)
treeeec67b450c55ea60ba41acf7eb8d9097b43f48a2 /libjava/include/jvm.h
parent7a59efae86cfa74ed45a0a78139082e8443873b1 (diff)
downloadgcc-21b2340908ecd93806e3928ad3ceff208b2e0573.zip
gcc-21b2340908ecd93806e3928ad3ceff208b2e0573.tar.gz
gcc-21b2340908ecd93806e3928ad3ceff208b2e0573.tar.bz2
re PR java/20215 (gcj does not accept classes with same name fields)
PR java/20215: * include/jvm.h (_Jv_Linker::find_field_helper): Updated. * link.cc (find_field_helper): Added 'type' argument. (find_field): Updated. From-SVN: r96032
Diffstat (limited to 'libjava/include/jvm.h')
-rw-r--r--libjava/include/jvm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index 61e426f..7668703 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -250,7 +250,8 @@ namespace gcj
class _Jv_Linker
{
private:
- static _Jv_Field *find_field_helper(jclass, _Jv_Utf8Const *, jclass *);
+ static _Jv_Field *find_field_helper(jclass, _Jv_Utf8Const *, _Jv_Utf8Const *,
+ jclass *);
static _Jv_Field *find_field(jclass, jclass, _Jv_Utf8Const *,
_Jv_Utf8Const *);
static void prepare_constant_time_tables(jclass);