Merge branch '11.4' into 'master'11.4

add upstream 11.4

See merge request opensource-tracking/FreeFileSync!28

1 files changed, 3 insertions, 3 deletions

diff --git a/xBRZ/src/xbrz_tools.h b/xBRZ/src/xbrz_tools.h
index 404849ca..98164678 100644
--- a/xBRZ/src/xbrz_tools.h
+++ b/xBRZ/src/xbrz_tools.h
@@ -182,10 +182,10 @@ void nearestNeighborScaleOverSource(const PixSrc* src, int srcWidth, int srcHeig
                                     /**/  PixTrg* trg, int trgWidth, int trgHeight, int trgPitch /*[bytes]*/,
                                     int yFirst, int yLast, PixConverter pixCvrt /*convert PixSrc to PixTrg*/)
 {
-    static_assert(std::is_integral<PixSrc>::value, "PixSrc* is expected to be cast-able to char*");
-    static_assert(std::is_integral<PixTrg>::value, "PixTrg* is expected to be cast-able to char*");
+    static_assert(std::is_integral_v<PixSrc>, "PixSrc* is expected to be cast-able to char*");
+    static_assert(std::is_integral_v<PixTrg>, "PixTrg* is expected to be cast-able to char*");
 
-    static_assert(std::is_same<decltype(pixCvrt(PixSrc())), PixTrg>::value, "PixConverter returning wrong pixel format");
+    static_assert(std::is_same_v<decltype(pixCvrt(PixSrc())), PixTrg>, "PixConverter returning wrong pixel format");
 
     if (srcPitch < srcWidth * static_cast<int>(sizeof(PixSrc))  ||
         trgPitch < trgWidth * static_cast<int>(sizeof(PixTrg)))