Skip to content

Commit 1f516f6

Browse files
author
Jonathan Dowland
committed
8324307: [11u] hotspot fails to build with GCC 12 and newer (non-static data member initializers)
Reviewed-by: sgehwolf
1 parent bcdad92 commit 1f516f6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ class CgroupV1Subsystem: public CgroupSubsystem {
105105

106106
private:
107107
/* controllers */
108-
CachingCgroupController* _memory = NULL;
109-
CgroupV1Controller* _cpuset = NULL;
110-
CachingCgroupController* _cpu = NULL;
111-
CgroupV1Controller* _cpuacct = NULL;
112-
CgroupV1Controller* _pids = NULL;
108+
CachingCgroupController* _memory;
109+
CgroupV1Controller* _cpuset;
110+
CachingCgroupController* _cpu;
111+
CgroupV1Controller* _cpuacct;
112+
CgroupV1Controller* _pids;
113113

114114
char * pids_max_val();
115115

src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ class CgroupV2Controller: public CgroupController {
5151
class CgroupV2Subsystem: public CgroupSubsystem {
5252
private:
5353
/* One unified controller */
54-
CgroupController* _unified = NULL;
54+
CgroupController* _unified;
5555
/* Caching wrappers for cpu/memory metrics */
56-
CachingCgroupController* _memory = NULL;
57-
CachingCgroupController* _cpu = NULL;
56+
CachingCgroupController* _memory;
57+
CachingCgroupController* _cpu;
5858

5959
char *mem_limit_val();
6060
char *mem_swp_limit_val();

0 commit comments

Comments
 (0)