diff --git a/tree/dataframe/src/RNTupleDS.cxx b/tree/dataframe/src/RNTupleDS.cxx index 8458036bfdd0c..0afb7dcefe10e 100644 --- a/tree/dataframe/src/RNTupleDS.cxx +++ b/tree/dataframe/src/RNTupleDS.cxx @@ -100,7 +100,7 @@ class RRDFCardinalityField final : public RRDFCardinalityFieldBase { { if constexpr (std::is_same_v || std::is_same_v) return; - if (size > std::numeric_limits::max()) { + if (size > static_cast(std::numeric_limits::max())) { throw RException(R__FAIL(std::string("integer overflow in field ") + GetFieldName() + ". Please read the column with a larger-sized integral type.")); } diff --git a/tree/dataframe/test/dataframe_hist.cxx b/tree/dataframe/test/dataframe_hist.cxx index 2d084785df2d9..f5fe396b50de3 100644 --- a/tree/dataframe/test/dataframe_hist.cxx +++ b/tree/dataframe/test/dataframe_hist.cxx @@ -265,7 +265,7 @@ TEST_P(RDFHist, InvalidNumberOfArguments) // Cannot use EXPECT_THROW because of template arguments... dfX.Hist({axis}, {"x", "x"}); FAIL() << "expected std::invalid_argument"; - } catch (const std::invalid_argument &e) { + } catch (const std::invalid_argument &) { // expected } @@ -274,7 +274,7 @@ TEST_P(RDFHist, InvalidNumberOfArguments) // Cannot use EXPECT_THROW because of template arguments... dfX.Hist(hist, {"x", "x"}); FAIL() << "expected std::invalid_argument"; - } catch (const std::invalid_argument &e) { + } catch (const std::invalid_argument &) { // expected } @@ -283,7 +283,7 @@ TEST_P(RDFHist, InvalidNumberOfArguments) // Cannot use EXPECT_THROW because of template arguments... dfX.Hist(engine, {"x", "x"}); FAIL() << "expected std::invalid_argument"; - } catch (const std::invalid_argument &e) { + } catch (const std::invalid_argument &) { // expected } } @@ -417,7 +417,7 @@ TEST_P(RDFHist, WeightInvalidNumberOfArguments) // Cannot use EXPECT_THROW because of template arguments... dfXW.Hist({axis}, {"x", "x"}, "w"); FAIL() << "expected std::invalid_argument"; - } catch (const std::invalid_argument &e) { + } catch (const std::invalid_argument &) { // expected } @@ -426,7 +426,7 @@ TEST_P(RDFHist, WeightInvalidNumberOfArguments) // Cannot use EXPECT_THROW because of template arguments... dfXW.Hist(hist, {"x", "x"}, "w"); FAIL() << "expected std::invalid_argument"; - } catch (const std::invalid_argument &e) { + } catch (const std::invalid_argument &) { // expected } @@ -435,7 +435,7 @@ TEST_P(RDFHist, WeightInvalidNumberOfArguments) // Cannot use EXPECT_THROW because of template arguments... dfXW.Hist(engine, {"x", "x"}, "w"); FAIL() << "expected std::invalid_argument"; - } catch (const std::invalid_argument &e) { + } catch (const std::invalid_argument &) { // expected } } diff --git a/tree/ntuple/test/ntuple_soa.cxx b/tree/ntuple/test/ntuple_soa.cxx index 889da7daeb8b8..f32c17c6d4a31 100644 --- a/tree/ntuple/test/ntuple_soa.cxx +++ b/tree/ntuple/test/ntuple_soa.cxx @@ -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("f", "SoABase")); + { + EXPECT_NO_THROW(auto f = std::make_unique("f", "SoABase")); + } try { auto f = std::make_unique("f", "SoASimpleBadArray"); @@ -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("f", "SoASimple")); + { + EXPECT_NO_THROW(auto f = std::make_unique("f", "SoASimple")); + } try { auto f = std::make_unique>("f");