Skip to content

Commit 1be39aa

Browse files
committedNov 5, 2019
8233530: gcc 5.4 build warning -Wc++14-compat after JDK-8233359
Reviewed-by: dholmes, goetz
1 parent c15dfbf commit 1be39aa

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed
 

‎src/hotspot/share/memory/operator_new.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ void operator delete [](void* p) throw() {
8989
fatal("Should not call global delete []");
9090
}
9191

92+
#ifdef __GNUG__
93+
// Warning disabled for gcc 5.4
94+
PRAGMA_DIAG_PUSH
95+
PRAGMA_DISABLE_GCC_WARNING("-Wc++14-compat")
96+
#endif // __GNUG__
97+
9298
void operator delete(void* p, size_t size) throw() {
9399
fatal("Should not call global sized delete");
94100
}
@@ -97,4 +103,8 @@ void operator delete [](void* p, size_t size) throw() {
97103
fatal("Should not call global sized delete []");
98104
}
99105

106+
#ifdef __GNUG__
107+
PRAGMA_DIAG_POP
108+
#endif // __GNUG__
109+
100110
#endif // Non-product

0 commit comments

Comments
 (0)
Please sign in to comment.