Skip to content

Commit

Permalink
MMCore: Remove warning suppression from build
Browse files Browse the repository at this point in the history
The warnings for dynamic exception specifications are now suppressed in
the code using pragmas for both GCC and MSVC.
  • Loading branch information
marktsuchida committed Dec 14, 2023
1 parent 5a665ce commit 97ecc51
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions MMCore/MMCore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)MMCore.lib</OutputFile>
Expand All @@ -70,7 +69,6 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)MMCore.lib</OutputFile>
Expand Down Expand Up @@ -183,4 +181,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
1 change: 0 additions & 1 deletion MMCore/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 97ecc51

Please sign in to comment.