diff --git a/src/core/include/mp-units/quantity_point.h b/src/core/include/mp-units/quantity_point.h index 67d96037..a7143274 100644 --- a/src/core/include/mp-units/quantity_point.h +++ b/src/core/include/mp-units/quantity_point.h @@ -238,12 +238,6 @@ public: }; // CTAD -template -explicit quantity_point(Q) -> quantity_point{}, typename Q::rep>; - -template -explicit quantity_point(Q, PO) -> quantity_point; - template explicit quantity_point(QP) -> quantity_point::reference, quantity_point_like_traits::point_origin, diff --git a/test/unit_test/static/quantity_point_test.cpp b/test/unit_test/static/quantity_point_test.cpp index 3b7a320f..f1107273 100644 --- a/test/unit_test/static/quantity_point_test.cpp +++ b/test/unit_test/static/quantity_point_test.cpp @@ -39,14 +39,14 @@ using sys_seconds = std::chrono::time_point { } mean_sea_level; -inline constexpr struct ground_level : relative_point_origin { +inline constexpr struct ground_level : relative_point_origin { } ground_level; -inline constexpr struct tower_peak : relative_point_origin { +inline constexpr struct tower_peak : relative_point_origin { } tower_peak; inline constexpr struct other_ground_level : - relative_point_origin { + relative_point_origin { } other_ground_level; inline constexpr struct other_absolute_level : absolute_point_origin { @@ -891,25 +891,25 @@ static_assert(is_of_type<(ground_level + 1 * m) - (other_ground_level + 1 * m), static_assert(is_of_type<(other_ground_level + 1 * m) - (tower_peak + 1 * m), quantity>); static_assert(is_of_type<(tower_peak + 1 * m) - (other_ground_level + 1 * m), quantity>); -static_assert(is_of_type>); -static_assert(is_of_type, int>>); -static_assert(is_of_type>); -static_assert(is_of_type, int>>); +static_assert(is_of_type>); +static_assert(is_of_type, int>>); +static_assert(is_of_type<(mean_sea_level + 1 * m) - mean_sea_level, quantity>); +static_assert(is_of_type<(mean_sea_level + 1 * km) - mean_sea_level, quantity, int>>); -static_assert(is_of_type>); -static_assert(is_of_type, int>>); -static_assert(is_of_type>); -static_assert(is_of_type, int>>); +static_assert(is_of_type>); +static_assert(is_of_type, int>>); +static_assert(is_of_type<(ground_level + 1 * m) - ground_level, quantity>); +static_assert(is_of_type<(ground_level + 1 * km) - ground_level, quantity, int>>); -static_assert(is_of_type>); -static_assert(is_of_type>); -static_assert(is_of_type>); -static_assert(is_of_type>); +static_assert(is_of_type>); +static_assert(is_of_type>); +static_assert(is_of_type<(ground_level + 1 * m) - mean_sea_level, quantity>); +static_assert(is_of_type<(ground_level + 1 * km) - mean_sea_level, quantity>); -static_assert(is_of_type>); -static_assert(is_of_type>); -static_assert(is_of_type>); -static_assert(is_of_type>); +static_assert(is_of_type>); +static_assert(is_of_type>); +static_assert(is_of_type<(mean_sea_level + 1 * m) - ground_level, quantity>); +static_assert(is_of_type<(mean_sea_level + 1 * km) - ground_level, quantity>); static_assert(is_of_type>); static_assert(is_of_type>);