diff --git a/src/java.desktop/windows/native/libawt/windows/alloc.h b/src/java.desktop/windows/native/libawt/windows/alloc.h index bb093a0d9c5..4c92c12cbca 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 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 ff9baf6464a..167ed62b505 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 @@ public: 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(); }