Skip to content

fix: avoid dangling-reference in sample tuple conversion for C++23 compatibility #423

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
henryiii wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: avoid dangling-reference in sample tuple conversion for C++23 compatibility #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions include/boost/histogram/detail/accumulator_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,29 @@ struct accumulator_traits_holder {

// member function pointer with weight_type as first argument is better match
template <class R, class T, class U, class... Ts>
accumulator_traits_holder<true, Ts...> accumulator_traits_impl_call_op(
accumulator_traits_holder<true, std::remove_cv_t<std::remove_reference_t<Ts>>...>
accumulator_traits_impl_call_op(
R (T::*)(boost::histogram::weight_type<U>, Ts...));

template <class R, class T, class U, class... Ts>
accumulator_traits_holder<true, Ts...> accumulator_traits_impl_call_op(
accumulator_traits_holder<true, std::remove_cv_t<std::remove_reference_t<Ts>>...>
accumulator_traits_impl_call_op(
R (T::*)(boost::histogram::weight_type<U>&, Ts...));

template <class R, class T, class U, class... Ts>
accumulator_traits_holder<true, Ts...> accumulator_traits_impl_call_op(
accumulator_traits_holder<true, std::remove_cv_t<std::remove_reference_t<Ts>>...>
accumulator_traits_impl_call_op(
R (T::*)(boost::histogram::weight_type<U>&&, Ts...));

template <class R, class T, class U, class... Ts>
accumulator_traits_holder<true, Ts...> accumulator_traits_impl_call_op(
accumulator_traits_holder<true, std::remove_cv_t<std::remove_reference_t<Ts>>...>
accumulator_traits_impl_call_op(
R (T::*)(const boost::histogram::weight_type<U>&, Ts...));

// member function pointer only considered if all specializations above fail
template <class R, class T, class... Ts>
accumulator_traits_holder<false, Ts...> accumulator_traits_impl_call_op(R (T::*)(Ts...));
accumulator_traits_holder<false, std::remove_cv_t<std::remove_reference_t<Ts>>...>
accumulator_traits_impl_call_op(R (T::*)(Ts...));

template <class T>
auto accumulator_traits_impl(T&, priority<2>)
Expand Down
2 changes: 1 addition & 1 deletion test/accumulators_collector_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bool operator==(const span<T1>& a, const std::vector<T2>& b) {
int main() {
using traits = detail::accumulator_traits<accumulators::collector<>>;
static_assert(!traits::weight_support, "");
static_assert(std::is_same<traits::args, std::tuple<const double&>>::value, "");
static_assert(std::is_same<traits::args, std::tuple<double>>::value, "");

{
accumulators::collector<std::vector<int>> acc;
Expand Down
2 changes: 1 addition & 1 deletion test/accumulators_mean_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int main() {

using traits = detail::accumulator_traits<m_t>;
static_assert(traits::weight_support, "");
static_assert(std::is_same<traits::args, std::tuple<const double&>>::value, "");
static_assert(std::is_same<traits::args, std::tuple<double>>::value, "");

// basic interface, string conversion
{
Expand Down
2 changes: 1 addition & 1 deletion test/detail_accumulator_traits_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ int main() {
};

BOOST_TEST(dtl::accumulator_traits<A7>::weight_support);
BOOST_TEST_TRAIT_SAME(typename dtl::accumulator_traits<A7>::args, std::tuple<int&&>);
BOOST_TEST_TRAIT_SAME(typename dtl::accumulator_traits<A7>::args, std::tuple<int>);

struct B1 {
int operator+=(int);
Expand Down
Loading