Improve checked build of Visual Studio 2022 17.9 (#304)

team-charls · Feb 13, 2024 · f2ff444 · f2ff444
1 parent 3998c6f
commit f2ff444
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -54,9 +54,13 @@
         C5246 = the initialization of a subobject should be wrapped in braces [prevents simple usage of std::byte]
         C5264 = 'const' variable is not used [reported for const in header files]
         C5258 = explicit capture of '' is not required for this use [VS 2019 requires capture of constexpr]
+      -->
+      <DisableSpecificWarnings Condition="'$(CHARLS_ALL_WARNINGS)'!=''">4061;4365;4464;4514;4571;4623;4625;4626;4710;4711;4738;4820;5026;5027;5045;5246;5264;5258</DisableSpecificWarnings>
+
+      <!--
         C6393 = A lookup table of size 365 is not sufficient to handle leap years [CharLS doesn't handle leap years]
       -->
-      <DisableSpecificWarnings Condition="'$(CHARLS_ALL_WARNINGS)'!=''">4061;4365;4464;4514;4571;4623;4625;4626;4710;4711;4738;4820;5026;5027;5045;5246;5264;5258;6393</DisableSpecificWarnings>
+      <DisableSpecificWarnings>6393;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <!--
         __cplusplus = Use the correct value for the __cplusplus macro

diff --git a/src/jpeg_stream_writer.cpp b/src/jpeg_stream_writer.cpp
@@ -64,7 +64,7 @@ void jpeg_stream_writer::write_spiff_header_segment(const spiff_header& header)
 }
 
 
-USE_DECL_ANNOTATIONS void jpeg_stream_writer::write_spiff_directory_entry(const uint32_t entry_tag,
+void jpeg_stream_writer::write_spiff_directory_entry(const uint32_t entry_tag,
                                                                           const span<const byte> entry_data)
 {
     write_segment_header(jpeg_marker_code::application_data8, sizeof(uint32_t) + entry_data.size());