rev 611 : Merge
*** 30,40 **** // A PermGen implemented with a CMS space, collected by a CMS collector. class CMSPermGen: public PermGen { friend class VMStructs; - HeapWord* mem_allocate_work(size_t size); protected: // The "generation" view. ConcurrentMarkSweepGeneration* _gen; public: --- 30,39 ----