From b528c374bbfe16d2922ea27607ed0d0116b723ab Mon Sep 17 00:00:00 2001 From: Julian Waters <32636402+TheShermanTanker@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:45:33 +0800 Subject: [PATCH 1/2] 8312147: Dynamic Exception Specification warnings are no longer required after JDK-8311380 --- src/java.desktop/windows/native/libawt/windows/alloc.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/java.desktop/windows/native/libawt/windows/alloc.h b/src/java.desktop/windows/native/libawt/windows/alloc.h index bb093a0d9c59a..4c92c12cbca4b 100644 --- a/src/java.desktop/windows/native/libawt/windows/alloc.h +++ b/src/java.desktop/windows/native/libawt/windows/alloc.h @@ -40,12 +40,6 @@ namespace std { class awt_toolkit_shutdown {}; -// Disable "C++ Exception Specification ignored" warnings. -// These warnings are generated because VC++ 5.0 allows, but does not enforce, -// exception specifications. This #pragma can be safely removed when VC++ -// is updated to enforce exception specifications. -#pragma warning(disable : 4290) - #ifdef TRY #error Multiple definitions of TRY #endif From 166b1fd0ba392701a75461abb8a8b1eaefd8109a Mon Sep 17 00:00:00 2001 From: Julian Waters <32636402+TheShermanTanker@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:38:14 +0800 Subject: [PATCH 2/2] Missed specifier in awt_Toolkit.h --- src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h index ff9baf6464a63..167ed62b5057b 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h +++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h @@ -254,7 +254,7 @@ class AwtToolkit { INLINE void SetModuleHandle(HMODULE h) { m_dllHandle = h; } INLINE static DWORD MainThread() { return GetInstance().m_mainThreadId; } - INLINE void VerifyActive() throw (awt_toolkit_shutdown) { + INLINE void VerifyActive() { if (!m_isActive && m_mainThreadId != ::GetCurrentThreadId()) { throw awt_toolkit_shutdown(); }