diff --git a/common/adc_value.h b/common/adc_value.h index 2a336ee..3ba3e88 100644 --- a/common/adc_value.h +++ b/common/adc_value.h @@ -101,7 +101,7 @@ protected: std::invocable&> auto&& setter, std::predicate&> auto&& validator) { - using value_t = traits::adc_retval_t; + using value_t = std::decay_t>; static_assert(!std::is_same_v, "THE getter MUST NOT RETURN void TYPE!!!"); @@ -250,9 +250,7 @@ public: { using from_sig_t = typename traits::adc_func_traits; using to_sig_t = typename traits::adc_func_traits; - // using value_t = typename to_sig_t::ret_t; // internal value type using value_t = std::remove_cv_t; // internal value type - // using user_t = typename from_sig_t::ret_t; using user_t = std::remove_cv_t; // static_assert(!std::is_same_v, "void IS NOT VALID TYPE!!!"); @@ -295,8 +293,9 @@ public: template operator UT() { - using v_t = std::remove_reference_t; - using val_t = std::conditional_t, std::add_pointer_t>, v_t>; + // using v_t = std::remove_reference_t; + // using val_t = std::conditional_t, std::add_pointer_t>, v_t>; + using val_t = std::decay_t; auto getter = _getterFunc[this]; if (getter) { @@ -309,9 +308,6 @@ public: template AdcValueHolder& operator=(UT&& value) { - // using v_t = std::remove_reference_t; - // using v_t = std::remove_cvref_t; - // using val_t = std::conditional_t, std::add_pointer_t>, v_t>; using val_t = std::decay_t; auto setter = _setterFunc[this];