comparison src/hotspot/share/gc/shared/gcUtil.inline.hpp @ 54526:ee29b516a36a

revert changes
author jlaskey
date Wed, 23 Jan 2019 16:09:20 -0400
parents 7c4d43c26352
children
comparison
equal deleted inserted replaced
0:ef89702cdcdf 1:7a38928f1ddb
1 /* 1 /*
2 * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #ifndef SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP 25 #ifndef SHARE_GC_SHARED_GCUTIL_INLINE_HPP
26 #define SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP 26 #define SHARE_GC_SHARED_GCUTIL_INLINE_HPP
27 27
28 #include "gc/shared/gcUtil.hpp" 28 #include "gc/shared/gcUtil.hpp"
29 #include "memory/allocation.inline.hpp" 29 #include "memory/allocation.inline.hpp"
30 30
31 inline void* AdaptivePaddedAverage::operator new(size_t size) throw() { 31 inline void* AdaptivePaddedAverage::operator new(size_t size) throw() {
32 return CHeapObj<mtGC>::operator new(size); 32 return CHeapObj<mtGC>::operator new(size);
33 } 33 }
34 34
35 #endif // SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP 35 #endif // SHARE_GC_SHARED_GCUTIL_INLINE_HPP