Skip to content

Commit 638ac84

Browse files
authored
[struct_pack] use unsigned long long integer literal to silence gcc warnings (#953)
1 parent 49d67e7 commit 638ac84

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

include/ylt/struct_pack/type_calculate.hpp

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,53 +37,55 @@ constexpr decltype(auto) get_size_literal() {
3737
return string_literal<char, 3>{
3838
{static_cast<char>(size % 127 + 1),
3939
static_cast<char>(size / 127 % 127 + 1),
40-
static_cast<char>(size / (127 * 127) + 129)}};
40+
static_cast<char>(size / (127ull * 127) + 129)}};
4141
}
4242
else if constexpr (size < 1ull * 127 * 127 * 127 * 127) {
4343
return string_literal<char, 4>{
4444
{static_cast<char>(size % 127 + 1),
4545
static_cast<char>(size / 127 % 127 + 1),
46-
static_cast<char>(size / (127 * 127) % 127 + 1),
47-
static_cast<char>(size / (127 * 127 * 127) + 129)}};
46+
static_cast<char>(size / (127ull * 127) % 127 + 1),
47+
static_cast<char>(size / (127ull * 127 * 127) + 129)}};
4848
}
4949
else if constexpr (size < 1ull * 127 * 127 * 127 * 127 * 127) {
5050
return string_literal<char, 5>{
5151
{static_cast<char>(size % 127 + 1),
5252
static_cast<char>(size / 127 % 127 + 1),
53-
static_cast<char>(size / (127 * 127) % 127 + 1),
54-
static_cast<char>(size / (127 * 127 * 127) % 127 + 1),
55-
static_cast<char>(size / (127 * 127 * 127 * 127) + 129)}};
53+
static_cast<char>(size / (127ull * 127) % 127 + 1),
54+
static_cast<char>(size / (127ull * 127 * 127) % 127 + 1),
55+
static_cast<char>(size / (127ull * 127 * 127 * 127) + 129)}};
5656
}
5757
else if constexpr (size < 1ull * 127 * 127 * 127 * 127 * 127 * 127) {
5858
return string_literal<char, 6>{
5959
{static_cast<char>(size % 127 + 1),
6060
static_cast<char>(size / 127 % 127 + 1),
61-
static_cast<char>(size / (127 * 127) % 127 + 1),
62-
static_cast<char>(size / (127 * 127 * 127) % 127 + 1),
63-
static_cast<char>(size / (127 * 127 * 127 * 127) % 127 + 1),
64-
static_cast<char>(size / (127 * 127 * 127 * 127 * 127) + 129)}};
61+
static_cast<char>(size / (127ull * 127) % 127 + 1),
62+
static_cast<char>(size / (127ull * 127 * 127) % 127 + 1),
63+
static_cast<char>(size / (127ull * 127 * 127 * 127) % 127 + 1),
64+
static_cast<char>(size / (127ull * 127 * 127 * 127 * 127) + 129)}};
6565
}
6666
else if constexpr (size < 1ull * 127 * 127 * 127 * 127 * 127 * 127 * 127) {
6767
return string_literal<char, 7>{
6868
{static_cast<char>(size % 127 + 1),
6969
static_cast<char>(size / 127 % 127 + 1),
70-
static_cast<char>(size / (127 * 127) % 127 + 1),
71-
static_cast<char>(size / (127 * 127 * 127) % 127 + 1),
72-
static_cast<char>(size / (127 * 127 * 127 * 127) % 127 + 1),
73-
static_cast<char>(size / (127 * 127 * 127 * 127 * 127) % 127 + 1),
74-
static_cast<char>(size / (127 * 127 * 127 * 127 * 127 * 127) + 129)}};
70+
static_cast<char>(size / (127ull * 127) % 127 + 1),
71+
static_cast<char>(size / (127ull * 127 * 127) % 127 + 1),
72+
static_cast<char>(size / (127ull * 127 * 127 * 127) % 127 + 1),
73+
static_cast<char>(size / (127ull * 127 * 127 * 127 * 127) % 127 + 1),
74+
static_cast<char>(size / (127ull * 127 * 127 * 127 * 127 * 127) +
75+
129)}};
7576
}
7677
else if constexpr (size <
7778
1ull * 127 * 127 * 127 * 127 * 127 * 127 * 127 * 127) {
7879
return string_literal<char, 8>{{
7980
static_cast<char>(size % 127 + 1),
8081
static_cast<char>(size / 127 % 127 + 1),
81-
static_cast<char>(size / (127 * 127) % 127 + 1),
82-
static_cast<char>(size / (127 * 127 * 127) % 127 + 1),
83-
static_cast<char>(size / (127 * 127 * 127 * 127) % 127 + 1),
84-
static_cast<char>(size / (127 * 127 * 127 * 127 * 127) % 127 + 1),
85-
static_cast<char>(size / (127 * 127 * 127 * 127 * 127 * 127) % 127 + 1),
86-
static_cast<char>(size / (127 * 127 * 127 * 127 * 127 * 127 * 127) +
82+
static_cast<char>(size / (127ull * 127) % 127 + 1),
83+
static_cast<char>(size / (127ull * 127 * 127) % 127 + 1),
84+
static_cast<char>(size / (127ull * 127 * 127 * 127) % 127 + 1),
85+
static_cast<char>(size / (127ull * 127 * 127 * 127 * 127) % 127 + 1),
86+
static_cast<char>(size / (127ull * 127 * 127 * 127 * 127 * 127) % 127 +
87+
1),
88+
static_cast<char>(size / (127ull * 127 * 127 * 127 * 127 * 127 * 127) +
8789
129),
8890
}};
8991
}
@@ -897,4 +899,4 @@ constexpr auto get_types() {
897899
}
898900

899901
} // namespace detail
900-
} // namespace struct_pack
902+
} // namespace struct_pack

0 commit comments

Comments
 (0)