Skip to content

Commit 702fea8

Browse files
8312147: Dynamic Exception Specification warnings are no longer required after JDK-8311380
Reviewed-by: prr, serb
1 parent e5ecbff commit 702fea8

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

src/java.desktop/windows/native/libawt/windows/alloc.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ namespace std {
4040

4141
class awt_toolkit_shutdown {};
4242

43-
// Disable "C++ Exception Specification ignored" warnings.
44-
// These warnings are generated because VC++ 5.0 allows, but does not enforce,
45-
// exception specifications. This #pragma can be safely removed when VC++
46-
// is updated to enforce exception specifications.
47-
#pragma warning(disable : 4290)
48-
4943
#ifdef TRY
5044
#error Multiple definitions of TRY
5145
#endif

src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class AwtToolkit {
254254
INLINE void SetModuleHandle(HMODULE h) { m_dllHandle = h; }
255255

256256
INLINE static DWORD MainThread() { return GetInstance().m_mainThreadId; }
257-
INLINE void VerifyActive() throw (awt_toolkit_shutdown) {
257+
INLINE void VerifyActive() {
258258
if (!m_isActive && m_mainThreadId != ::GetCurrentThreadId()) {
259259
throw awt_toolkit_shutdown();
260260
}

0 commit comments

Comments
 (0)