8312147: Dynamic Exception Specification warnings are no longer required after JDK-8311380
Reviewed-by: prr, serb
This commit is contained in:
parent
e5ecbff69e
commit
702fea8deb
src/java.desktop/windows/native/libawt/windows
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user