Mercurial > hg > truffle
diff src/share/vm/memory/heapInspection.hpp @ 6854:fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
author | jprovino |
---|---|
date | Wed, 10 Oct 2012 14:35:58 -0400 |
parents | da91efe96a93 |
children | 16fb9f942703 db9981fd3124 |
line wrap: on
line diff
--- a/src/share/vm/memory/heapInspection.hpp Fri Oct 05 13:37:08 2012 -0700 +++ b/src/share/vm/memory/heapInspection.hpp Wed Oct 10 14:35:58 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, 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 @@ -28,7 +28,7 @@ #include "memory/allocation.inline.hpp" #include "oops/oop.inline.hpp" -#ifndef SERVICES_KERNEL +#if INCLUDE_SERVICES // HeapInspection @@ -129,12 +129,12 @@ void sort(); }; -#endif // SERVICES_KERNEL +#endif // INCLUDE_SERVICES class HeapInspection : public AllStatic { public: - static void heap_inspection(outputStream* st, bool need_prologue) KERNEL_RETURN; - static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) KERNEL_RETURN; + static void heap_inspection(outputStream* st, bool need_prologue) NOT_SERVICES_RETURN; + static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN; }; #endif // SHARE_VM_MEMORY_HEAPINSPECTION_HPP