diff --git a/common/adc_valholder.h b/common/adc_valholder.h index ee54cd0..f6ccbf2 100644 --- a/common/adc_valholder.h +++ b/common/adc_valholder.h @@ -530,19 +530,13 @@ public: */ -template GT, - typename VALT = traits::adc_retval_t, - std::invocable ST, - typename... Ts> -HolderT makeArithmValue(GT&& getter, ST&& setter, Ts&&... other_ctor_args) +template +HolderT makeArithmValue(Ts&&... ctor_args) { - using val_t = traits::adc_retval_t; + static_assert(std::is_same_v || std::is_same_v, + "Invalid value holder type!!!"); - static_assert(std::is_arithmetic_v, "GETTER MUST RETURN AN ARITHMETIC TYPE VALUE!!!"); - - return HolderT(AdcValueHolder::defaultTrivialConvTypes, std::forward(getter), std::forward(setter), - std::forward(other_ctor_args)...); + return HolderT(AdcValueHolder::defaultTrivialConvTypes, std::forward(ctor_args)...); } } // namespace adc