Mercurial > hg > truffle
comparison src/share/vm/oops/klass.hpp @ 7411:8580f22db905
Merge
author | coleenp |
---|---|
date | Fri, 14 Dec 2012 16:43:37 -0800 |
parents | 30866cd626b0 |
children | 989155e2d07a 16fb9f942703 44c5fcd9cb25 db9981fd3124 |
comparison
equal
deleted
inserted
replaced
7408:892acf0431ef | 7411:8580f22db905 |
---|---|
449 | 449 |
450 virtual oop protection_domain() { return NULL; } | 450 virtual oop protection_domain() { return NULL; } |
451 | 451 |
452 oop class_loader() const; | 452 oop class_loader() const; |
453 | 453 |
454 virtual oop klass_holder() const { return class_loader(); } | |
455 | |
454 protected: | 456 protected: |
455 virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS); | 457 virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS); |
456 virtual Klass* array_klass_impl(bool or_null, TRAPS); | 458 virtual Klass* array_klass_impl(bool or_null, TRAPS); |
457 | 459 |
458 public: | 460 public: |