feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

refactor: nodiscard added

Browse Source
This commit is contained in:
Mateusz Pusz
2022-09-08 23:08:00 +02:00
parent a3d4c8f01f
commit f516e3287e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/include/units/bits/expression_template.h
View File

@@ -287,7 +287,7 @@ public:
}; };
template<typename NumList, typename DenList, typename OneType, template<typename...> typename To> template<typename NumList, typename DenList, typename OneType, template<typename...> typename To>
constexpr auto expr_expression_impl() [[nodiscard]] constexpr auto expr_expression_impl()
{ {
constexpr std::size_t num = type_list_size<NumList>; constexpr std::size_t num = type_list_size<NumList>;
constexpr std::size_t den = type_list_size<DenList>; constexpr std::size_t den = type_list_size<DenList>;
@@ -312,7 +312,7 @@ using expr_expression = decltype(expr_expression_impl<NumList, DenList, OneType,
template<typename NumList, typename DenList, typename OneType, template<typename, typename> typename Pred, template<typename NumList, typename DenList, typename OneType, template<typename, typename> typename Pred,
template<typename...> typename To> template<typename...> typename To>
constexpr auto get_optimized_expression() [[nodiscard]] constexpr auto get_optimized_expression()
{ {
using num_list = expr_consolidate<NumList>; using num_list = expr_consolidate<NumList>;
using den_list = expr_consolidate<DenList>; using den_list = expr_consolidate<DenList>;
@@ -332,7 +332,7 @@ constexpr auto get_optimized_expression()
*/ */
template<typename T1, typename T2, typename OneType, template<typename, typename> typename Pred, template<typename T1, typename T2, typename OneType, template<typename, typename> typename Pred,
template<typename...> typename To> template<typename...> typename To>
constexpr auto expr_multiply() [[nodiscard]] constexpr auto expr_multiply()
{ {
if constexpr (is_same_v<T1, OneType>) { if constexpr (is_same_v<T1, OneType>) {
return T2{}; return T2{};
@@ -356,7 +356,7 @@ constexpr auto expr_multiply()
template<typename T1, typename T2, typename OneType, template<typename, typename> typename Pred, template<typename T1, typename T2, typename OneType, template<typename, typename> typename Pred,
template<typename...> typename To> template<typename...> typename To>
constexpr auto expr_divide() [[nodiscard]] constexpr auto expr_divide()
{ {
if constexpr (is_same_v<T1, T2>) { if constexpr (is_same_v<T1, T2>) {
return OneType{}; return OneType{};
@@ -378,7 +378,7 @@ constexpr auto expr_divide()
} }
template<typename T, typename OneType, template<typename...> typename To> template<typename T, typename OneType, template<typename...> typename To>
constexpr auto expr_invert() [[nodiscard]] constexpr auto expr_invert()
{ {
if constexpr (is_specialization_of<T, To>) if constexpr (is_specialization_of<T, To>)
return expr_expression<typename T::den, typename T::num, OneType, To>{}; return expr_expression<typename T::den, typename T::num, OneType, To>{};

8
src/core/include/units/unit.h
View File

@@ -221,26 +221,26 @@ using type_list_of_unit_less = expr_less<T1, T2, unit_less>;
} // namespace detail } // namespace detail
template<Unit U1, Unit U2> template<Unit U1, Unit U2>
constexpr Unit auto operator*(U1, U2) [[nodiscard]] constexpr Unit auto operator*(U1, U2)
{ {
return detail::expr_multiply<U1, U2, struct one, detail::type_list_of_unit_less, derived_unit>(); return detail::expr_multiply<U1, U2, struct one, detail::type_list_of_unit_less, derived_unit>();
} }
template<Unit U1, Unit U2> template<Unit U1, Unit U2>
constexpr Unit auto operator/(U1, U2) [[nodiscard]] constexpr Unit auto operator/(U1, U2)
{ {
return detail::expr_divide<U1, U2, struct one, detail::type_list_of_unit_less, derived_unit>(); return detail::expr_divide<U1, U2, struct one, detail::type_list_of_unit_less, derived_unit>();
} }
template<Unit U> template<Unit U>
constexpr Unit auto operator/(int value, U) [[nodiscard]] constexpr Unit auto operator/(int value, U)
{ {
gsl_Assert(value == 1); gsl_Assert(value == 1);
return detail::expr_invert<U, struct one, derived_unit>(); return detail::expr_invert<U, struct one, derived_unit>();
} }
template<Unit U1, Unit U2> template<Unit U1, Unit U2>
constexpr bool operator==(U1, U2) [[nodiscard]] constexpr bool operator==(U1, U2)
{ {
return false; return false;
} }