Skip to content

[win32] suppress compiler warnings #21992

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
linev merged 3 commits into from
Apr 23, 2026
+13 −9
Merged

[win32] suppress compiler warnings #21992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e6ffc9
[ntupe] suppress windows warnings in ntuple_soa.cxx test
linev Apr 21, 2026
1a6247a
[dataframe] suppress windows warnings in dataframe_hist.cxx
linev Apr 21, 2026
6b8302f
[RNTuple] suppress windows warning in RNTupleDS.cxx
linev Apr 21, 2026
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
2 changes: 1 addition & 1 deletion tree/dataframe/src/RNTupleDS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class RRDFCardinalityField final : public RRDFCardinalityFieldBase {
{
if constexpr (std::is_same_v<T, bool> || std::is_same_v<T, std::uint64_t>)
return;
if (size > std::numeric_limits<T>::max()) {
if (size > static_cast<ROOT::NTupleSize_t>(std::numeric_limits<T>::max())) {
throw RException(R__FAIL(std::string("integer overflow in field ") + GetFieldName() +
". Please read the column with a larger-sized integral type."));
}
Expand Down
12 changes: 6 additions & 6 deletions tree/dataframe/test/dataframe_hist.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ TEST_P(RDFHist, InvalidNumberOfArguments)
// Cannot use EXPECT_THROW because of template arguments...
dfX.Hist</*BinContentType=*/double, double, double>({axis}, {"x", "x"});
FAIL() << "expected std::invalid_argument";
} catch (const std::invalid_argument &e) {
} catch (const std::invalid_argument &) {
// expected
}

Expand All @@ -274,7 +274,7 @@ TEST_P(RDFHist, InvalidNumberOfArguments)
// Cannot use EXPECT_THROW because of template arguments...
dfX.Hist<double, double>(hist, {"x", "x"});
FAIL() << "expected std::invalid_argument";
} catch (const std::invalid_argument &e) {
} catch (const std::invalid_argument &) {
// expected
}

Expand All @@ -283,7 +283,7 @@ TEST_P(RDFHist, InvalidNumberOfArguments)
// Cannot use EXPECT_THROW because of template arguments...
dfX.Hist<double, double>(engine, {"x", "x"});
FAIL() << "expected std::invalid_argument";
} catch (const std::invalid_argument &e) {
} catch (const std::invalid_argument &) {
// expected
}
}
Expand Down Expand Up @@ -417,7 +417,7 @@ TEST_P(RDFHist, WeightInvalidNumberOfArguments)
// Cannot use EXPECT_THROW because of template arguments...
dfXW.Hist</*BinContentType=*/double, double, double, double>({axis}, {"x", "x"}, "w");
FAIL() << "expected std::invalid_argument";
} catch (const std::invalid_argument &e) {
} catch (const std::invalid_argument &) {
// expected
}

Expand All @@ -426,7 +426,7 @@ TEST_P(RDFHist, WeightInvalidNumberOfArguments)
// Cannot use EXPECT_THROW because of template arguments...
dfXW.Hist<double, double, double>(hist, {"x", "x"}, "w");
FAIL() << "expected std::invalid_argument";
} catch (const std::invalid_argument &e) {
} catch (const std::invalid_argument &) {
// expected
}

Expand All @@ -435,7 +435,7 @@ TEST_P(RDFHist, WeightInvalidNumberOfArguments)
// Cannot use EXPECT_THROW because of template arguments...
dfXW.Hist<double, double, double>(engine, {"x", "x"}, "w");
FAIL() << "expected std::invalid_argument";
} catch (const std::invalid_argument &e) {
} catch (const std::invalid_argument &) {
// expected
}
}
Expand Down
8 changes: 6 additions & 2 deletions tree/ntuple/test/ntuple_soa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ TEST(RNTuple, SoACheck)
} catch (const ROOT::RException &e) {
EXPECT_THAT(e.what(), ::testing::HasSubstr("SoA fields with inheritance are currently unsupported"));
}
EXPECT_NO_THROW(std::make_unique<RSoAField>("f", "SoABase"));
{
EXPECT_NO_THROW(auto f = std::make_unique<RSoAField>("f", "SoABase"));
}

try {
auto f = std::make_unique<RSoAField>("f", "SoASimpleBadArray");
Expand Down Expand Up @@ -104,7 +106,9 @@ TEST(RNTuple, SoACheck)
EXPECT_THAT(e.what(), ::testing::HasSubstr("SoA member type mismatch: fY (double [Double32_t] vs. float)"));
}

EXPECT_NO_THROW(std::make_unique<RSoAField>("f", "SoASimple"));
{
EXPECT_NO_THROW(auto f = std::make_unique<RSoAField>("f", "SoASimple"));
}

try {
auto f = std::make_unique<ROOT::RField<SoA>>("f");
Expand Down
Loading