Skip to content

Commit 7a10242

Browse files
author
Thomas Schatzl
committed
fix compilation and issue with parameter evaluation ordering
1 parent e60ce68 commit 7a10242

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/hotspot/share/gc/g1/g1RegionPinCache.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
#include "precompiled.hpp"
2626

2727
#include "gc/g1/g1RegionPinCache.hpp"
28-
#include "gc/g1/g1CollectedHeap.hpp"
28+
#include "gc/g1/g1CollectedHeap.inline.hpp"
29+
#include "gc/g1/heapRegion.inline.hpp"
2930

3031
G1RegionPinCache::~G1RegionPinCache() {
3132
if (_count != 0) {

src/hotspot/share/gc/g1/g1RegionPinCache.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class G1RegionPinCache : public StackObj {
5151
}
5252

5353
Pair<uint, size_t> get_and_reset() {
54-
Pair<uint, size_t> result(_region_idx, get_and_set(0, 0));
55-
return result;
54+
return Pair<uint, size_t> { _region_idx, get_and_set(0, 0) };
5655
}
5756
};
5857

0 commit comments

Comments
 (0)