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

cmcstl2 library updated to 2019.08.07

Browse Source
This commit is contained in:
Mateusz Pusz
2019-08-08 13:49:51 +02:00
parent ae65407876
commit eb5ff0bf99
25 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/units/bits/concepts.h
+3 -3
View File
@@ -27,8 +27,8 @@
namespace std::experimental::units {
template<typename T>
concept bool Number = std::Regular<T> &&
std::StrictTotallyOrdered<T> &&
concept bool Number = std::regular<T> &&
std::totally_ordered<T> &&
requires(T a, T b) {
{ a + b } -> T;
{ a - b } -> T;
@@ -41,6 +41,6 @@ namespace std::experimental::units {
{ a /= b } -> T&;
{ T{0} };// can construct a T from a zero
// …
} ;
};
} // namespace std::experimental::units
src/include/units/bits/downcasting.h
+1 -1
View File
@@ -37,7 +37,7 @@ namespace std::experimental::units {
requires {
typename T::base_type;
} &&
std::DerivedFrom<T, downcast_base<typename T::base_type>>;
std::derived_from<T, downcast_base<typename T::base_type>>;
template<Downcastable T>
using downcast_from = T::base_type;
src/include/units/bits/hacks.h
+5 -6
View File
@@ -39,11 +39,10 @@ namespace std {
#endif // UNITS_HAS_STD_TYPE_IDENTITY
// concepts
using experimental::ranges::Same;
using experimental::ranges::Integral;
using experimental::ranges::DerivedFrom;
using experimental::ranges::Regular;
using experimental::ranges::StrictTotallyOrdered;
using experimental::ranges::ConvertibleTo;
using experimental::ranges::same_as;
using experimental::ranges::derived_from;
using experimental::ranges::regular;
using experimental::ranges::totally_ordered;
using experimental::ranges::convertible_to;
}
src/include/units/dimensions/acceleration.h
+1 -1
View File
@@ -30,7 +30,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<acceleration>> : downcast_to<acceleration> {};
template<typename T>
concept bool Acceleration = Quantity<T> && std::Same<typename T::dimension, acceleration>;
concept bool Acceleration = Quantity<T> && std::same_as<typename T::dimension, acceleration>;
struct metre_per_second_sq : derived_unit<acceleration, metre, second> {};
template<> struct downcasting_traits<downcast_from<metre_per_second_sq>> : downcast_to<metre_per_second_sq> {};
src/include/units/dimensions/area.h
+1 -1
View File
@@ -30,7 +30,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<area>> : downcast_to<area> {};
template<typename T>
concept bool Area = Quantity<T> && std::Same<typename T::dimension, area>;
concept bool Area = Quantity<T> && std::same_as<typename T::dimension, area>;
struct square_millimetre : derived_unit<area, millimetre> {};
template<> struct downcasting_traits<downcast_from<square_millimetre>> : downcast_to<square_millimetre> {};
src/include/units/dimensions/capacitance.h
+1 -1
View File
@@ -32,7 +32,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<capacitance>> : downcast_to<capacitance> {};
template<typename T>
concept bool Capacitance = Quantity<T> && std::Same<typename T::dimension, capacitance>;
concept bool Capacitance = Quantity<T> && std::same_as<typename T::dimension, capacitance>;
struct farad : derived_unit<capacitance, kilogram, metre, second, ampere> {};
template<> struct downcasting_traits<downcast_from<farad>> : downcast_to<farad> {};
src/include/units/dimensions/current.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<current>> : downcast_to<current> {};
template<typename T>
concept bool Current = Quantity<T> && std::Same<typename T::dimension, current>;
concept bool Current = Quantity<T> && std::same_as<typename T::dimension, current>;
struct ampere : unit<current> {};
template<> struct downcasting_traits<downcast_from<ampere>> : downcast_to<ampere> {};
src/include/units/dimensions/electric_charge.h
+1 -1
View File
@@ -32,7 +32,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<electric_charge>> : downcast_to<electric_charge> {};
template<typename T>
concept bool ElectricCharge = Quantity<T> && std::Same<typename T::dimension, electric_charge>;
concept bool ElectricCharge = Quantity<T> && std::same_as<typename T::dimension, electric_charge>;
struct coulomb : derived_unit<electric_charge, second, ampere> {};
template<> struct downcasting_traits<downcast_from<coulomb>> : downcast_to<coulomb> {};
src/include/units/dimensions/energy.h
+1 -1
View File
@@ -32,7 +32,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<energy>> : downcast_to<energy> {};
template<typename T>
concept bool Energy = Quantity<T> && std::Same<typename T::dimension, energy>;
concept bool Energy = Quantity<T> && std::same_as<typename T::dimension, energy>;
struct joule : derived_unit<energy, kilogram, metre, second> {};
template<> struct downcasting_traits<downcast_from<joule>> : downcast_to<joule> {};
src/include/units/dimensions/force.h
+1 -1
View File
@@ -33,7 +33,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<force>> : downcast_to<force> {};
template<typename T>
concept bool Force = Quantity<T> && std::Same<typename T::dimension, force>;
concept bool Force = Quantity<T> && std::same_as<typename T::dimension, force>;
struct newton : derived_unit<force, kilogram, metre, second> {};
template<> struct downcasting_traits<downcast_from<newton>> : downcast_to<newton> {};
src/include/units/dimensions/frequency.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<frequency>> : downcast_to<frequency> {};
template<typename T>
concept bool Frequency = Quantity<T> && std::Same<typename T::dimension, frequency>;
concept bool Frequency = Quantity<T> && std::same_as<typename T::dimension, frequency>;
struct hertz : derived_unit<frequency, second> {};
template<> struct downcasting_traits<downcast_from<hertz>> : downcast_to<hertz> {};
src/include/units/dimensions/length.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<length>> : downcast_to<length> {};
template<typename T>
concept bool Length = Quantity<T> && std::Same<typename T::dimension, length>;
concept bool Length = Quantity<T> && std::same_as<typename T::dimension, length>;
// SI units
struct metre : unit<length> {};
src/include/units/dimensions/luminous_intensity.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<luminous_intensity>> : downcast_to<luminous_intensity> {};
template<typename T>
concept bool LuminousIntensity = Quantity<T> && std::Same<typename T::dimension, luminous_intensity>;
concept bool LuminousIntensity = Quantity<T> && std::same_as<typename T::dimension, luminous_intensity>;
struct candela : unit<luminous_intensity> {};
template<> struct downcasting_traits<downcast_from<candela>> : downcast_to<candela> {};
src/include/units/dimensions/mass.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<mass>> : downcast_to<mass> {};
template<typename T>
concept bool Mass = Quantity<T> && std::Same<typename T::dimension, mass>;
concept bool Mass = Quantity<T> && std::same_as<typename T::dimension, mass>;
struct gram : unit<mass, ratio<1, 1000>> {};
template<> struct downcasting_traits<downcast_from<gram>> : downcast_to<gram> {};
src/include/units/dimensions/power.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<power>> : downcast_to<power> {};
template<typename T>
concept bool Power = Quantity<T> && std::Same<typename T::dimension, power>;
concept bool Power = Quantity<T> && std::same_as<typename T::dimension, power>;
struct watt : derived_unit<power, kilogram, metre, second> {};
template<> struct downcasting_traits<downcast_from<watt>> : downcast_to<watt> {};
src/include/units/dimensions/pressure.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<pressure>> : downcast_to<pressure> {};
template<typename T>
concept bool Pressure = Quantity<T> && std::Same<typename T::dimension, pressure>;
concept bool Pressure = Quantity<T> && std::same_as<typename T::dimension, pressure>;
struct pascal : derived_unit<pressure, kilogram, metre, second> {};
template<> struct downcasting_traits<downcast_from<pascal>> : downcast_to<pascal> {};
src/include/units/dimensions/substance.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<substance>> : downcast_to<substance> {};
template<typename T>
concept bool Substance = Quantity<T> && std::Same<typename T::dimension, substance>;
concept bool Substance = Quantity<T> && std::same_as<typename T::dimension, substance>;
struct mole : unit<substance> {};
template<> struct downcasting_traits<downcast_from<mole>> : downcast_to<mole> {};
src/include/units/dimensions/temperature.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<temperature>> : downcast_to<temperature> {};
template<typename T>
concept bool ThermodynamicTemperature = Quantity<T> && std::Same<typename T::dimension, temperature>;
concept bool ThermodynamicTemperature = Quantity<T> && std::same_as<typename T::dimension, temperature>;
struct kelvin : unit<temperature> {};
template<> struct downcasting_traits<downcast_from<kelvin>> : downcast_to<kelvin> {};
src/include/units/dimensions/time.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<time>> : downcast_to<time> {};
template<typename T>
concept bool Time = Quantity<T> && std::Same<typename T::dimension, time>;
concept bool Time = Quantity<T> && std::same_as<typename T::dimension, time>;
struct second : unit<time> {};
template<> struct downcasting_traits<downcast_from<second>> : downcast_to<second> {};
src/include/units/dimensions/velocity.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<velocity>> : downcast_to<velocity> {};
template<typename T>
concept bool Velocity = Quantity<T> && std::Same<typename T::dimension, velocity>;
concept bool Velocity = Quantity<T> && std::same_as<typename T::dimension, velocity>;
struct metre_per_second : derived_unit<velocity, metre, second> {};
template<> struct downcasting_traits<downcast_from<metre_per_second>> : downcast_to<metre_per_second> {};
src/include/units/dimensions/voltage.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<voltage>> : downcast_to<voltage> {};
template<typename T>
concept bool Voltage = Quantity<T> && std::Same<typename T::dimension, voltage>;
concept bool Voltage = Quantity<T> && std::same_as<typename T::dimension, voltage>;
struct volt : derived_unit<voltage, kilogram, metre, second, ampere> {};
template<> struct downcasting_traits<downcast_from<volt>> : downcast_to<volt> {};
src/include/units/dimensions/volume.h
+1 -1
View File
@@ -30,7 +30,7 @@ namespace std::experimental::units {
template<> struct downcasting_traits<downcast_from<volume>> : downcast_to<volume> {};
template<typename T>
concept bool Volume = Quantity<T> && std::Same<typename T::dimension, volume>;
concept bool Volume = Quantity<T> && std::same_as<typename T::dimension, volume>;
struct cubic_millimetre : derived_unit<volume, millimetre> {};
template<> struct downcasting_traits<downcast_from<cubic_millimetre>> : downcast_to<cubic_millimetre> {};
src/include/units/quantity.h
+17 -17
View File
@@ -67,7 +67,7 @@ namespace std::experimental::units {
};
template<typename U1, typename Rep1, typename U2, typename Rep2, typename Rep>
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
struct common_quantity<quantity<U1, Rep1>, quantity<U2, Rep2>, Rep> {
using type = quantity<downcasting_traits_t<unit<typename U1::dimension, common_ratio<typename U1::ratio, typename U2::ratio>>>, Rep>;
};
@@ -124,7 +124,7 @@ namespace std::experimental::units {
} // namespace detail
template<Quantity To, typename U, typename Rep>
requires std::Same<typename To::dimension, typename U::dimension>
requires std::same_as<typename To::dimension, typename U::dimension>
constexpr To quantity_cast(const quantity<U, Rep>& q)
{
using c_ratio = ratio_divide<typename U::ratio, typename To::unit::ratio>;
@@ -159,15 +159,15 @@ namespace std::experimental::units {
quantity() = default;
quantity(const quantity&) = default;
template<std::ConvertibleTo<rep> Rep2>
template<std::convertible_to<rep> Rep2>
requires treat_as_floating_point<rep> || (!treat_as_floating_point<Rep2>)
constexpr explicit quantity(const Rep2& r) : value_{static_cast<rep>(r)}
{
}
template<Quantity Q2>
requires std::Same<dimension, typename Q2::dimension> &&
std::ConvertibleTo<typename Q2::rep, rep> &&
requires std::same_as<dimension, typename Q2::dimension> &&
std::convertible_to<typename Q2::rep, rep> &&
(treat_as_floating_point<rep> ||
(std::ratio_divide<typename Q2::unit::ratio, typename unit::ratio>::den == 1 &&
!treat_as_floating_point<typename Q2::rep>))
@@ -242,7 +242,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr Quantity operator+(const quantity<U1, Rep1>& lhs,
const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
using common_rep = decltype(lhs.count() + rhs.count());
using ret = common_quantity_t<quantity<U1, Rep1>, quantity<U2, Rep2>, common_rep>;
@@ -252,7 +252,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr Quantity operator-(const quantity<U1, Rep1>& lhs,
const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
using common_rep = decltype(lhs.count() - rhs.count());
using ret = common_quantity_t<quantity<U1, Rep1>, quantity<U2, Rep2>, common_rep>;
@@ -282,7 +282,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr Scalar operator*(const quantity<U1, Rep1>& lhs,
const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, dim_invert_t<typename U2::dimension>>
requires std::same_as<typename U1::dimension, dim_invert_t<typename U2::dimension>>
{
using common_rep = decltype(lhs.count() * rhs.count());
using ratio = ratio_multiply<typename U1::ratio, typename U2::ratio>;
@@ -292,7 +292,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr Quantity operator*(const quantity<U1, Rep1>& lhs,
const quantity<U2, Rep2>& rhs)
requires (!std::Same<typename U1::dimension, dim_invert_t<typename U2::dimension>>) &&
requires (!std::same_as<typename U1::dimension, dim_invert_t<typename U2::dimension>>) &&
(treat_as_floating_point<decltype(lhs.count() * rhs.count())> ||
(std::ratio_multiply<typename U1::ratio, typename U2::ratio>::den == 1))
{
@@ -333,7 +333,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr Scalar operator/(const quantity<U1, Rep1>& lhs,
const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
Expects(rhs != std::remove_cvref_t<decltype(rhs)>(0));
@@ -345,7 +345,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr Quantity operator/(const quantity<U1, Rep1>& lhs,
const quantity<U2, Rep2>& rhs)
requires (!std::Same<typename U1::dimension, typename U2::dimension>) &&
requires (!std::same_as<typename U1::dimension, typename U2::dimension>) &&
(treat_as_floating_point<decltype(lhs.count() / rhs.count())> ||
(ratio_divide<typename U1::ratio, typename U2::ratio>::den == 1))
{
@@ -379,7 +379,7 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr bool operator==(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
using ct = common_quantity_t<quantity<U1, Rep1>, quantity<U2, Rep2>>;
return ct(lhs).count() == ct(rhs).count();
@@ -387,14 +387,14 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr bool operator!=(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
return !(lhs == rhs);
}
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr bool operator<(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
using ct = common_quantity_t<quantity<U1, Rep1>, quantity<U2, Rep2>>;
return ct(lhs).count() < ct(rhs).count();
@@ -402,21 +402,21 @@ namespace std::experimental::units {
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr bool operator<=(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
return !(rhs < lhs);
}
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr bool operator>(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
return rhs < lhs;
}
template<typename U1, typename Rep1, typename U2, typename Rep2>
[[nodiscard]] constexpr bool operator>=(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
requires std::Same<typename U1::dimension, typename U2::dimension>
requires std::same_as<typename U1::dimension, typename U2::dimension>
{
return !(lhs < rhs);
}