1.1 --- a/src/share/vm/classfile/resolutionErrors.hpp Wed Jun 27 15:23:36 2012 +0200
1.2 +++ b/src/share/vm/classfile/resolutionErrors.hpp Thu Jun 28 17:03:16 2012 -0400
1.3 @@ -33,7 +33,7 @@
1.4 // ResolutionError objects are used to record errors encountered during
1.5 // constant pool resolution (JVMS 5.4.3).
1.6
1.7 -class ResolutionErrorTable : public Hashtable<constantPoolOop> {
1.8 +class ResolutionErrorTable : public Hashtable<constantPoolOop, mtClass> {
1.9
1.10 public:
1.11 ResolutionErrorTable(int table_size);
1.12 @@ -42,15 +42,16 @@
1.13 void free_entry(ResolutionErrorEntry *entry);
1.14
1.15 ResolutionErrorEntry* bucket(int i) {
1.16 - return (ResolutionErrorEntry*)Hashtable<constantPoolOop>::bucket(i);
1.17 + return (ResolutionErrorEntry*)Hashtable<constantPoolOop, mtClass>::bucket(i);
1.18 }
1.19
1.20 ResolutionErrorEntry** bucket_addr(int i) {
1.21 - return (ResolutionErrorEntry**)Hashtable<constantPoolOop>::bucket_addr(i);
1.22 + return (ResolutionErrorEntry**)Hashtable<constantPoolOop, mtClass>::bucket_addr(i);
1.23 }
1.24
1.25 void add_entry(int index, ResolutionErrorEntry* new_entry) {
1.26 - Hashtable<constantPoolOop>::add_entry(index, (HashtableEntry<constantPoolOop>*)new_entry);
1.27 + Hashtable<constantPoolOop, mtClass>::add_entry(index,
1.28 + (HashtableEntry<constantPoolOop, mtClass>*)new_entry);
1.29 }
1.30
1.31 void add_entry(int index, unsigned int hash,
1.32 @@ -74,7 +75,7 @@
1.33 };
1.34
1.35
1.36 -class ResolutionErrorEntry : public HashtableEntry<constantPoolOop> {
1.37 +class ResolutionErrorEntry : public HashtableEntry<constantPoolOop, mtClass> {
1.38 private:
1.39 int _cp_index;
1.40 Symbol* _error;
1.41 @@ -90,11 +91,11 @@
1.42 void set_error(Symbol* e);
1.43
1.44 ResolutionErrorEntry* next() const {
1.45 - return (ResolutionErrorEntry*)HashtableEntry<constantPoolOop>::next();
1.46 + return (ResolutionErrorEntry*)HashtableEntry<constantPoolOop, mtClass>::next();
1.47 }
1.48
1.49 ResolutionErrorEntry** next_addr() {
1.50 - return (ResolutionErrorEntry**)HashtableEntry<constantPoolOop>::next_addr();
1.51 + return (ResolutionErrorEntry**)HashtableEntry<constantPoolOop, mtClass>::next_addr();
1.52 }
1.53
1.54 // GC support
