Skip to content

Commit 7c44c02

Browse files
authored
fix(types): fix compat. issues with older compilers (#140)
1 parent 41914d0 commit 7c44c02

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/common/types.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace {
2828
}
2929

3030
std::byte operator+(const std::byte &lhs, const std::byte &rhs) {
31-
return std::byte {static_cast<std::uint8_t>(std::to_integer<int>(lhs) + std::to_integer<int>(rhs))};
31+
return std::byte {static_cast<std::uint8_t>(static_cast<int>(lhs) + static_cast<int>(rhs))};
3232
}
3333
} // namespace
3434

@@ -81,8 +81,8 @@ namespace display_device {
8181
{
8282
constexpr std::byte ascii_offset {'@'};
8383

84-
const auto byte_a {data[8]};
85-
const auto byte_b {data[9]};
84+
auto byte_a {data[8]};
85+
auto byte_b {data[9]};
8686
std::array<char, 3> man_id {};
8787

8888
man_id[0] = static_cast<char>(ascii_offset + ((byte_a & std::byte {0x7C}) >> 2));
@@ -102,8 +102,8 @@ namespace display_device {
102102
// ---- Product code (HEX representation)
103103
{
104104
std::uint16_t prod_num {0};
105-
prod_num |= std::to_integer<int>(data[10]) << 0;
106-
prod_num |= std::to_integer<int>(data[11]) << 8;
105+
prod_num |= static_cast<int>(data[10]) << 0;
106+
prod_num |= static_cast<int>(data[11]) << 8;
107107

108108
std::stringstream stream;
109109
stream << std::setfill('0') << std::setw(4) << std::hex << std::uppercase << prod_num;
@@ -113,10 +113,10 @@ namespace display_device {
113113
// ---- Serial number
114114
{
115115
std::uint32_t serial_num {0};
116-
serial_num |= std::to_integer<int>(data[12]) << 0;
117-
serial_num |= std::to_integer<int>(data[13]) << 8;
118-
serial_num |= std::to_integer<int>(data[14]) << 16;
119-
serial_num |= std::to_integer<int>(data[15]) << 24;
116+
serial_num |= static_cast<int>(data[12]) << 0;
117+
serial_num |= static_cast<int>(data[13]) << 8;
118+
serial_num |= static_cast<int>(data[14]) << 16;
119+
serial_num |= static_cast<int>(data[15]) << 24;
120120

121121
edid.m_serial_number = serial_num;
122122
}

src/windows/win_api_layer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ namespace display_device {
491491
std::ostringstream output;
492492
output << "[";
493493
for (std::size_t i = 0; i < data.size(); ++i) {
494-
output << "0x" << std::setw(2) << std::setfill('0') << std::hex << std::uppercase << std::to_integer<int>(data[i]);
494+
output << "0x" << std::setw(2) << std::setfill('0') << std::hex << std::uppercase << static_cast<int>(data[i]);
495495
if (i + 1 < data.size()) {
496496
output << " ";
497497
}

0 commit comments

Comments
 (0)