Skip to content

Fix compile warnings #63

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

Merged
james-d-mitchell merged 2 commits into from
Nov 20, 2025
Merged

Fix compile warnings #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d92870
build: bump minimum cmake version
james-d-mitchell Nov 14, 2025
81a8815
bmat8+bmat16: fix complile warnings
james-d-mitchell Nov 14, 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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#****************************************************************************#

# Require at least 3.8 so that we can set cmake_policy CMP0067 below
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)

#####################
# Project description
Expand Down Expand Up @@ -122,6 +122,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/third_party
${PROJECT_BINARY_DIR})

# add_compile_options(-Wall -Wextra -Wpedantic)

#########
# Testing

Expand Down
24 changes: 12 additions & 12 deletions include/hpcombi/bmat16_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ inline BMat16 BMat16::mult_naive(BMat16 const &that) const noexcept {
c <<= 1;
d <<= 1;
for (size_t k = 0; k < 8; ++k) {
a |= ((*this)(i, k) & that(k, j)) |
((*this)(i, k + 8) & that(k + 8, j));
b |= ((*this)(i, k) & that(k, j + 8)) |
((*this)(i, k + 8) & that(k + 8, j + 8));
c |= ((*this)(i + 8, k) & that(k, j)) |
((*this)(i + 8, k + 8) & that(k + 8, j));
d |= ((*this)(i + 8, k) & that(k, j + 8)) |
((*this)(i + 8, k + 8) & that(k + 8, j + 8));
a |= ((*this)(i, k) && that(k, j)) ||
((*this)(i, k + 8) && that(k + 8, j));
b |= ((*this)(i, k) && that(k, j + 8)) ||
((*this)(i, k + 8) && that(k + 8, j + 8));
c |= ((*this)(i + 8, k) && that(k, j)) ||
((*this)(i + 8, k + 8) && that(k + 8, j));
d |= ((*this)(i + 8, k) && that(k, j + 8)) ||
((*this)(i + 8, k + 8) && that(k + 8, j + 8));
}
}
}
Expand All @@ -215,10 +215,10 @@ inline BMat16 BMat16::mult_naive_array(BMat16 const &that) const noexcept {
c <<= 1;
d <<= 1;
for (size_t k = 0; k < 16; ++k) {
a |= tab1[i][k] & tab2[k][j];
b |= tab1[i][k] & tab2[k][j + 8];
c |= tab1[i + 8][k] & tab2[k][j];
d |= tab1[i + 8][k] & tab2[k][j + 8];
a |= tab1[i][k] && tab2[k][j];
b |= tab1[i][k] && tab2[k][j + 8];
c |= tab1[i + 8][k] && tab2[k][j];
d |= tab1[i + 8][k] && tab2[k][j + 8];
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions include/hpcombi/bmat8_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ inline BMat8 BMat8::mult_naive(BMat8 const &that) const noexcept {
for (int j = 0; j < 8; j++) {
a <<= 1;
for (int k = 0; k < 8; k++) {
a |= ((*this)(i, k) & that(k, j));
a |= ((*this)(i, k) && that(k, j));
}
}
}
Expand All @@ -266,7 +266,7 @@ inline BMat8 BMat8::mult_naive_array(BMat8 const &that) const noexcept {
for (int j = 0; j < 8; j++) {
a <<= 1;
for (int k = 0; k < 8; k++) {
a |= tab1[i][k] & tab2[k][j];
a |= tab1[i][k] && tab2[k][j];
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions tests/test_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ struct HPCombiListener : Catch::EventListenerBase {
std::cout << testInfo.tagsAsString() << " " << testInfo.name
<< std::endl;
}
void testCaseEnded(Catch::TestCaseStats const &testInfo) override {}
void sectionStarting(Catch::SectionInfo const &sectionStats) override {}
void sectionEnded(Catch::SectionStats const &sectionStats) override {}
void testCasePartialStarting(Catch::TestCaseInfo const &testInfo,
uint64_t partNumber) override {}
void testCasePartialEnded(Catch::TestCaseStats const &testCaseStats,
uint64_t partNumber) override {}
void testCaseEnded(Catch::TestCaseStats const &) override {}
void sectionStarting(Catch::SectionInfo const &) override {}
void sectionEnded(Catch::SectionStats const &) override {}
void testCasePartialStarting(Catch::TestCaseInfo const &,
uint64_t) override {}
void testCasePartialEnded(Catch::TestCaseStats const &, uint64_t) override {
}
};

CATCH_REGISTER_LISTENER(HPCombiListener)