Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8312147: Dynamic Exception Specification warnings are no longer required after JDK-8311380 #14899

Closed
wants to merge 2 commits into from
+1 −7
Closed

8312147: Dynamic Exception Specification warnings are no longer required after JDK-8311380 #14899

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b528c37
8312147: Dynamic Exception Specification warnings are no longer requi…
TheShermanTanker Jul 17, 2023
166b1fd
Missed specifier in awt_Toolkit.h
TheShermanTanker Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/java.desktop/windows/native/libawt/windows/alloc.h
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
View file
Original file line number Diff line number Diff line change
@@ -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();
}