mirror of
https://git.freebsd.org/ports.git
synced 2025-05-13 15:51:51 -04:00
7955b1d7ec
Clang 19 has become more strict about initialization with undefined
behavior, resulting in errors similar to:
./SimpleModule.h:126:40: error: in-class initializer for static data member is not a constant expression
126 | static const int kMinSignedValue = -1 << kScaleBits;
| ~~~^~~~~~~~~~~~~
./SimpleModule.h:176:22: note: in instantiation of template class 'signConverter<kInt8>' requested here
176 | transform<typename signConverter<Format>::signedToUnsigned>(src, dst, count);
| ^
./SimpleModule.h:183:5: note: in instantiation of function template specialization 'ConvertSign::convertSignedToUnsigned<kInt8>' requested here
183 | convertSignedToUnsigned<kInt8>(src, dst, count);
| ^
This is because left-shifting negative values is undefined. Replace -1
with ~0u which results in the expected value.
While here, add a few other patches to remove warnings about undefined
left-shifts, and add support for the "make test" target.
PR: 281477
Approved by: maintainer timeout (2 weeks)
MFH: 2024Q3
20 lines
786 B
C++
20 lines
786 B
C++
--- test/Sign.cpp.orig 2013-02-11 17:23:26 UTC
|
|
+++ test/Sign.cpp
|
|
@@ -116,7 +116,7 @@ TEST_F(SignConversionTest, Int16)
|
|
EXPECT_EQ(readData[i], expectedData[i]);
|
|
}
|
|
|
|
-static const int32_t kMinInt24 = -1<<23;
|
|
+static const int32_t kMinInt24 = ~0u<<23;
|
|
static const int32_t kMaxInt24 = (1<<23) - 1;
|
|
static const uint32_t kMaxUInt24 = (1<<24) - 1;
|
|
|
|
@@ -157,7 +157,7 @@ TEST_F(SignConversionTest, Int32)
|
|
AFframecount framesRead = afReadFrames(file, AF_DEFAULT_TRACK, readData, frameCount);
|
|
ASSERT_EQ(framesRead, frameCount);
|
|
afCloseFile(file);
|
|
- const uint32_t expectedData[] = { 0, -kMinInt32, kMaxUInt32 };
|
|
+ const uint32_t expectedData[] = { 0, -static_cast<uint32_t>(kMinInt32), kMaxUInt32 };
|
|
for (int i=0; i<frameCount; i++)
|
|
EXPECT_EQ(readData[i], expectedData[i]);
|
|
}
|