diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp index 41b6022565e..34d6621c820 100644 --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp @@ -28,7 +28,7 @@ #include "gc/parallel/psGCAdaptivePolicyCounters.hpp" #include "gc/parallel/psScavenge.hpp" #include "gc/shared/gcCause.hpp" -#include "gc/shared/gcUtil.inline.hpp" +#include "gc/shared/gcUtil.hpp" #include "gc/shared/gcPolicyCounters.hpp" #include "logging/log.hpp" #include "runtime/timer.hpp" diff --git a/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp index ea94d13a1a5..3a0b3188a9a 100644 --- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp +++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/shared/adaptiveSizePolicy.hpp" #include "gc/shared/gcCause.hpp" -#include "gc/shared/gcUtil.inline.hpp" +#include "gc/shared/gcUtil.hpp" #include "logging/log.hpp" #include "runtime/timer.hpp" diff --git a/src/hotspot/share/gc/shared/gcStats.cpp b/src/hotspot/share/gc/shared/gcStats.cpp index a90f0f01a5c..42307e974d2 100644 --- a/src/hotspot/share/gc/shared/gcStats.cpp +++ b/src/hotspot/share/gc/shared/gcStats.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "gc/shared/gcStats.hpp" -#include "gc/shared/gcUtil.inline.hpp" +#include "gc/shared/gcUtil.hpp" #include "gc/shared/gc_globals.hpp" GCStats::GCStats() : _avg_promoted(new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, PromotedPadding)) {} diff --git a/src/hotspot/share/gc/shared/gcUtil.hpp b/src/hotspot/share/gc/shared/gcUtil.hpp index 8da6b31af21..8b6ef8d5b0c 100644 --- a/src/hotspot/share/gc/shared/gcUtil.hpp +++ b/src/hotspot/share/gc/shared/gcUtil.hpp @@ -143,11 +143,6 @@ class AdaptivePaddedAverage : public AdaptiveWeightedAverage { AdaptiveWeightedAverage(weight), _padded_avg(0.0), _deviation(0.0), _padding(padding) {} - // Placement support - void* operator new(size_t ignored, void* p) throw() { return p; } - // Allocator - void* operator new(size_t size) throw(); - // Accessor float padded_average() const { return _padded_avg; } float deviation() const { return _deviation; } diff --git a/src/hotspot/share/gc/shared/gcUtil.inline.hpp b/src/hotspot/share/gc/shared/gcUtil.inline.hpp deleted file mode 100644 index 5c0a8547e32..00000000000 --- a/src/hotspot/share/gc/shared/gcUtil.inline.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2002, 2019, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef SHARE_GC_SHARED_GCUTIL_INLINE_HPP -#define SHARE_GC_SHARED_GCUTIL_INLINE_HPP - -#include "gc/shared/gcUtil.hpp" - -#include "memory/allocation.inline.hpp" - -inline void* AdaptivePaddedAverage::operator new(size_t size) throw() { - return CHeapObj::operator new(size); -} - -#endif // SHARE_GC_SHARED_GCUTIL_INLINE_HPP