1.1 --- a/src/share/vm/runtime/fieldDescriptor.hpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/runtime/fieldDescriptor.hpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -28,7 +28,7 @@
1.4 #include "oops/constantPoolOop.hpp"
1.5 #include "oops/klassOop.hpp"
1.6 #include "oops/oop.inline.hpp"
1.7 -#include "oops/symbolOop.hpp"
1.8 +#include "oops/symbol.hpp"
1.9 #include "runtime/fieldType.hpp"
1.10 #include "utilities/accessFlags.hpp"
1.11 #include "utilities/constantTag.hpp"
1.12 @@ -49,15 +49,15 @@
1.13 constantPoolHandle _cp;
1.14
1.15 public:
1.16 - symbolOop name() const { return _cp->symbol_at(_name_index); }
1.17 - symbolOop signature() const { return _cp->symbol_at(_signature_index); }
1.18 + Symbol* name() const { return _cp->symbol_at(_name_index); }
1.19 + Symbol* signature() const { return _cp->symbol_at(_signature_index); }
1.20 klassOop field_holder() const { return _cp->pool_holder(); }
1.21 constantPoolOop constants() const { return _cp(); }
1.22 AccessFlags access_flags() const { return _access_flags; }
1.23 oop loader() const;
1.24 // Offset (in words) of field from start of instanceOop / klassOop
1.25 int offset() const { return _offset; }
1.26 - symbolOop generic_signature() const { return (_generic_signature_index > 0 ? _cp->symbol_at(_generic_signature_index) : (symbolOop)NULL); }
1.27 + Symbol* generic_signature() const { return (_generic_signature_index > 0 ? _cp->symbol_at(_generic_signature_index) : (Symbol*)NULL); }
1.28 int index() const { return _index; }
1.29 typeArrayOop annotations() const;
1.30
