Merge branch 'master' into chiphogg/switch-to-mag
This commit is contained in:
commit
ef9e6522ca
30 files changed
+391
-116
No files matched your search
@@ -27,12 +27,12 @@
|
||||
|
||||
namespace units::detail {
|
||||
|
||||
// same_scaled_units
|
||||
// compatible_units
|
||||
template<typename ExpList, Unit... Us>
|
||||
inline constexpr bool same_scaled_units = false;
|
||||
inline constexpr bool compatible_units = false;
|
||||
|
||||
template<typename... Es, Unit... Us>
|
||||
inline constexpr bool same_scaled_units<exponent_list<Es...>, Us...> = (UnitOf<Us, typename Es::dimension> && ...);
|
||||
inline constexpr bool compatible_units<exponent_list<Es...>, Us...> = (UnitOf<Us, typename Es::dimension> && ...);
|
||||
|
||||
// derived_scaled_unit
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ constexpr auto operator_text()
|
||||
if constexpr (Divide && NegativeExpCount == 1) {
|
||||
return basic_fixed_string("/");
|
||||
} else {
|
||||
return basic_symbol_text(" ⋅ ", " ");
|
||||
return basic_symbol_text("⋅", " ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user