Skip to content

Commit

Permalink
Block: disambiguate registerBlock function
Browse files Browse the repository at this point in the history
Because the variadic template could also match for zero type parameters,
this created an ambiguous template definition with the function above.

Signed-off-by: Alexander Krimm <[email protected]>
  • Loading branch information
wirew0rm authored and RalphSteinhagen committed Dec 5, 2024
1 parent 2591eaa commit 0080aa7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/include/gnuradio-4.0/Block.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2081,10 +2081,10 @@ inline int registerBlock(auto& registerInstance) {
return 0;
}

template<typename TBlock0, typename... More>
template<typename TBlock0, typename TBlock1, typename... More>
inline int registerBlock(auto& registerInstance) {
registerBlock<TBlock0>(registerInstance);
return registerBlock<More...>(registerInstance);
return registerBlock<TBlock1, More...>(registerInstance);
}

/**
Expand Down

0 comments on commit 0080aa7

Please sign in to comment.