Fix warnings and build on some compilers

rikyoz · Jan 17, 2024 · 8857bc7 · 8857bc7
1 parent b723936
commit 8857bc7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/include/bit7z/bitoutputarchive.hpp b/include/bit7z/bitoutputarchive.hpp
@@ -55,7 +55,7 @@ using DeletedItems = std::set< uint32_t >;
  * Note: given an InputIndex i:
  *         if i < mInputArchiveItemsCount, the item is old (old item in the input archive);
  *         if i >= mInputArchiveItemsCount, the item is new (added by the user); */
-enum class InputIndex : std::uint32_t {};
+enum class InputIndex : std::uint32_t {}; // NOLINT(*-enum-size)
 
 class UpdateCallback;
 

diff --git a/src/internal/cfixedbufferoutstream.cpp b/src/internal/cfixedbufferoutstream.cpp
@@ -21,7 +21,7 @@
 #include "bittypes.hpp"
 #include "internal/util.hpp"
 
-#include <algorithm> //for std::copy_n
+#include <algorithm> // for std::copy_n
 #include <cstdint>
 #include <cstddef>
 

diff --git a/src/internal/windows.hpp b/src/internal/windows.hpp
@@ -90,8 +90,9 @@ constexpr auto WIN32_MASK = 0x0000FFFF;
 
 /* Note: p7zip uses FACILITY_WIN32, 7-zip version of HRESULT_FROM_WIN32 uses FACILITY_ERRNO. */
 inline constexpr auto HRESULT_FROM_WIN32( unsigned int x ) -> HRESULT {
-    auto res = static_cast< HRESULT >( x );
-    return ( res > 0 ) ? static_cast< HRESULT >( ( x & WIN32_MASK ) | ( FACILITY_WIN32 << 16u ) | 0x80000000 ) : res;
+    return ( static_cast< HRESULT >( x ) > 0 ) ?
+                static_cast< HRESULT >( ( x & WIN32_MASK ) | ( FACILITY_WIN32 << 16u ) | 0x80000000 ) :
+                static_cast< HRESULT >( x );
 }
 
 constexpr auto ERROR_NEGATIVE_SEEK = 0x100131;

diff --git a/tests/src/test_bitoutputarchive.cpp b/tests/src/test_bitoutputarchive.cpp
@@ -39,7 +39,7 @@ TEST_CASE( "BitOutputArchive: Compressing a commented file should preserve the c
     REQUIRE_NOTHROW( writer.addFile( path_to_tstring( commentedFile ) ) );
 
     TempTestDirectory testOutDir{ "test_bitinputarchive" };
-    INFO( "Output directory: " << testOutDir );
+    INFO( "Output directory: " << testOutDir )
 
     const auto* const outputArchive = BIT7Z_STRING( "commented.7z" );
     REQUIRE_NOTHROW( writer.compressTo( outputArchive ) );

diff --git a/tests/src/test_dateutil.cpp b/tests/src/test_dateutil.cpp
@@ -14,6 +14,8 @@
 
 #include <internal/dateutil.hpp>
 
+#include <ctime> // For std::time_t (on MSVC 2015).
+
 using namespace bit7z;
 
 /* Note: std::time_t is usually a UNIX timestamp, so we are using only dates after the UNIX epoch datetime.

diff --git a/tests/src/utils/filesystem.cpp b/tests/src/utils/filesystem.cpp
@@ -313,7 +313,7 @@ auto get_file_comment( const fs::path& filePath ) -> std::wstring {
     CCoInitialize init;
     CMyComPtr< IPropertyStore > propertyStore{};
     SHGetPropertyStoreFromParsingName( filePath.c_str(), nullptr, GPS_READWRITE, IID_PPV_ARGS( &propertyStore ) );
-    return get_property_as_string( propertyStore, PKEY_Comment );
+    return propertyStore != nullptr ? get_property_as_string( propertyStore, PKEY_Comment ) : L"";
 }
 #endif