Mercurial > hg > truffle
diff src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | da91efe96a93 |
children |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,22 +45,6 @@ HeapWord* result() const { return _result; } }; -class VM_ParallelGCFailedPermanentAllocation: public VM_GC_Operation { -private: - size_t _size; - HeapWord* _result; - - public: - VM_ParallelGCFailedPermanentAllocation(size_t size, - unsigned int gc_count, - unsigned int full_gc_count); - virtual VMOp_Type type() const { - return VMOp_ParallelGCFailedPermanentAllocation; - } - virtual void doit(); - HeapWord* result() const { return _result; } -}; - class VM_ParallelGCSystemGC: public VM_GC_Operation { public: VM_ParallelGCSystemGC(unsigned int gc_count, unsigned int full_gc_count,