From 97ecc51a3e7214dd312c6b2f00f0bf9e30bfb7d7 Mon Sep 17 00:00:00 2001
From: "Mark A. Tsuchida" <matsuchida@wisc.edu>
Date: Thu, 14 Dec 2023 14:49:37 -0600
Subject: [PATCH] MMCore: Remove warning suppression from build

The warnings for dynamic exception specifications are now suppressed in
the code using pragmas for both GCC and MSVC.
---
 MMCore/MMCore.vcxproj | 4 +---
 MMCore/meson.build    | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/MMCore/MMCore.vcxproj b/MMCore/MMCore.vcxproj
index 26d732feb..413f2b563 100644
--- a/MMCore/MMCore.vcxproj
+++ b/MMCore/MMCore.vcxproj
@@ -55,7 +55,6 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)MMCore.lib</OutputFile>
@@ -70,7 +69,6 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)MMCore.lib</OutputFile>
@@ -183,4 +181,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MMCore/meson.build b/MMCore/meson.build
index b60ab51fc..d7399dc29 100644
--- a/MMCore/meson.build
+++ b/MMCore/meson.build
@@ -15,7 +15,6 @@ cxx = meson.get_compiler('cpp')
 
 if cxx.get_id() in ['msvc', 'clang-cl']
     add_project_arguments('-DNOMINMAX', language: 'cpp')
-    add_project_arguments('/wd4290', language: 'cpp')
 endif
 
 # MMDevice must be copied into subprojects/ for this experimental build to work