Skip to content

Commit

Permalink
8312147: Dynamic Exception Specification warnings are no longer requi…
Browse files Browse the repository at this point in the history
…red after JDK-8311380

Reviewed-by: prr, serb
  • Loading branch information
TheShermanTanker committed Jul 19, 2023
1 parent e5ecbff commit 702fea8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions src/java.desktop/windows/native/libawt/windows/alloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

1 comment on commit 702fea8

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.