Skip to content

Fix C++20 -Wdeprecated-enum-enum-conversion warning by using integer types for matrix::num_rows and num_cols #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NBickford-NV wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix C++20 -Wdeprecated-enum-enum-conversion warning by using integer types for matrix::num_rows and num_cols #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d0f54
Use integer types for matrix::num_rows and num_cols
nvmheyer Nov 26, 2025
f70ed92
Also avoid uint32_t -> int casts that produced warnings in CI
NBickford-NV Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions encoder/basisu_math.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,12 +1130,12 @@ namespace bu_math
template <class X, class Y, class Z>
Z& matrix_mul_helper(Z& result, const X& lhs, const Y& rhs)
{
static_assert((int)Z::num_rows == (int)X::num_rows);
static_assert((int)Z::num_cols == (int)Y::num_cols);
static_assert((int)X::num_cols == (int)Y::num_rows);
static_assert(Z::num_rows == X::num_rows);
static_assert(Z::num_cols == Y::num_cols);
static_assert(X::num_cols == Y::num_rows);
assert(((void*)&result != (void*)&lhs) && ((void*)&result != (void*)&rhs));
for (int r = 0; r < X::num_rows; r++)
for (int c = 0; c < Y::num_cols; c++)
for (uint32_t r = 0; r < X::num_rows; r++)
for (uint32_t c = 0; c < Y::num_cols; c++)
{
typename Z::scalar_type s = lhs(r, 0) * rhs(0, c);
for (uint32_t i = 1; i < X::num_cols; i++)
Expand All @@ -1148,12 +1148,12 @@ namespace bu_math
template <class X, class Y, class Z>
Z& matrix_mul_helper_transpose_lhs(Z& result, const X& lhs, const Y& rhs)
{
static_assert((int)Z::num_rows == (int)X::num_cols);
static_assert((int)Z::num_cols == (int)Y::num_cols);
static_assert((int)X::num_rows == (int)Y::num_rows);
static_assert(Z::num_rows == X::num_cols);
static_assert(Z::num_cols == Y::num_cols);
static_assert(X::num_rows == Y::num_rows);
assert(((void*)&result != (void*)&lhs) && ((void*)&result != (void*)&rhs));
for (int r = 0; r < X::num_cols; r++)
for (int c = 0; c < Y::num_cols; c++)
for (uint32_t r = 0; r < X::num_cols; r++)
for (uint32_t c = 0; c < Y::num_cols; c++)
{
typename Z::scalar_type s = lhs(0, r) * rhs(0, c);
for (uint32_t i = 1; i < X::num_rows; i++)
Expand All @@ -1166,12 +1166,12 @@ namespace bu_math
template <class X, class Y, class Z>
Z& matrix_mul_helper_transpose_rhs(Z& result, const X& lhs, const Y& rhs)
{
static_assert((int)Z::num_rows == (int)X::num_rows);
static_assert((int)Z::num_cols == (int)Y::num_rows);
static_assert((int)X::num_cols == (int)Y::num_cols);
static_assert(Z::num_rows == X::num_rows);
static_assert(Z::num_cols == Y::num_rows);
static_assert(X::num_cols == Y::num_cols);
assert(((void*)&result != (void*)&lhs) && ((void*)&result != (void*)&rhs));
for (int r = 0; r < X::num_rows; r++)
for (int c = 0; c < Y::num_rows; c++)
for (uint32_t r = 0; r < X::num_rows; r++)
for (uint32_t c = 0; c < Y::num_rows; c++)
{
typename Z::scalar_type s = lhs(r, 0) * rhs(c, 0);
for (uint32_t i = 1; i < X::num_cols; i++)
Expand All @@ -1186,11 +1186,8 @@ namespace bu_math
{
public:
typedef T scalar_type;
enum
{
num_rows = R,
num_cols = C
};
static const uint32_t num_rows = R;
static const uint32_t num_cols = C;

typedef vec<R, T> col_vec;
typedef vec < (R > 1) ? (R - 1) : 0, T > subcol_vec;
Expand Down Expand Up @@ -2144,7 +2141,7 @@ namespace bu_math
static inline matrix make_tensor_product_matrix(const row_vec& v, const row_vec& w)
{
matrix ret;
for (int r = 0; r < num_rows; r++)
for (uint32_t r = 0; r < num_rows; r++)
ret[r] = row_vec::mul_components(v.broadcast(r), w);
return ret;
}
Expand Down