diff --git a/test/unit_test/static/reference_test.cpp b/test/unit_test/static/reference_test.cpp index 7ab7de56..010b77f5 100644 --- a/test/unit_test/static/reference_test.cpp +++ b/test/unit_test/static/reference_test.cpp @@ -54,17 +54,12 @@ QUANTITY_SPEC_(arc_length, length); QUANTITY_SPEC_(frequency, 1 / time); QUANTITY_SPEC_(activity, 1 / time); QUANTITY_SPEC_(area, length* length); -QUANTITY_SPEC_(volume, area* length); QUANTITY_SPEC_(angular_measure, dimensionless, arc_length / radius, is_kind); QUANTITY_SPEC_(solid_angular_measure, dimensionless, area / pow<2>(radius), is_kind); QUANTITY_SPEC_(speed, length / time); QUANTITY_SPEC_(acceleration, speed / time); QUANTITY_SPEC_(force, mass* acceleration); -QUANTITY_SPEC_(moment_of_force, length* force); -QUANTITY_SPEC_(torque, moment_of_force); QUANTITY_SPEC_(power, force* speed); -QUANTITY_SPEC_(efficiency, power / power); -QUANTITY_SPEC_(energy, force* length); QUANTITY_SPEC_(storage_capacity, dimensionless, is_kind); // base units @@ -78,13 +73,10 @@ namespace nu { inline constexpr struct second_ : named_unit<"s"> {} second; inline constexpr struct minute_ : named_unit<"min", mag<60> * second> {} minute; -inline constexpr struct gram_ : named_unit<"g"> {} gram; -inline constexpr struct kilogram_ : decltype(si::kilo) {} kilogram; inline constexpr struct time : system_reference {} time; inline constexpr struct length : system_reference {} length; inline constexpr struct speed : system_reference {} speed; -inline constexpr struct force : system_reference {} force; } @@ -94,7 +86,6 @@ inline constexpr struct steradian_ : named_unit<"sr", square(metre) / square(met inline constexpr struct hertz_ : named_unit<"Hz", 1 / second, kind_of> {} hertz; inline constexpr struct becquerel_ : named_unit<"Bq", 1 / second, kind_of> {} becquerel; inline constexpr struct newton_ : named_unit<"N", kilogram * metre / square(second)> {} newton; -inline constexpr struct pascal_ : named_unit<"Pa", newton / square(metre)> {} pascal; inline constexpr struct joule_ : named_unit<"J", newton * metre> {} joule; inline constexpr struct watt_ : named_unit<"W", joule / second> {} watt; diff --git a/test/unit_test/static/unit_test.cpp b/test/unit_test/static/unit_test.cpp index 9c9df682..ff5ab4ef 100644 --- a/test/unit_test/static/unit_test.cpp +++ b/test/unit_test/static/unit_test.cpp @@ -71,18 +71,9 @@ inline constexpr struct degree_Celsius_ : named_unit * second> {} minute; inline constexpr struct hour_ : named_unit<"h", mag<60> * minute> {} hour; -inline constexpr struct day_ : named_unit<"d", mag<24> * hour> {} day; -inline constexpr struct astronomical_unit_ : named_unit<"au", mag<149'597'870'700> * metre> {} astronomical_unit; inline constexpr struct degree_ : named_unit * radian> {} degree; -inline constexpr struct are_ : named_unit<"a", square(si::deca)> {} are; -inline constexpr struct hectare_ : decltype(si::hecto) {} hectare; -inline constexpr struct litre_ : named_unit<"l", cubic(si::deci)> {} litre; -inline constexpr struct tonne_ : named_unit<"t", mag<1000> * kilogram> {} tonne; -inline constexpr struct dalton_ : named_unit<"Da", mag * mag_power<10, -27> * kilogram> {} dalton; -inline constexpr struct electronvolt_ : named_unit<"eV", mag * mag_power<10, -19> * joule> {} electronvolt; inline constexpr struct yard_ : named_unit<"yd", mag * metre> {} yard; -inline constexpr struct foot_ : named_unit<"ft", mag * yard> {} foot; inline constexpr struct mile_ : named_unit<"mi", mag<1760> * yard> {} mile; inline constexpr struct kilometre_ : decltype(si::kilo) {} kilometre; @@ -119,7 +110,6 @@ static_assert(detail::NamedUnit); static_assert(detail::NamedUnit); static_assert(!detail::NamedUnit); static_assert(!detail::NamedUnit); -static_assert(!detail::NamedUnit); static_assert(!detail::NamedUnit)>); static_assert(!detail::NamedUnit); static_assert(!detail::NamedUnit);