From d6b7562d74efcccf517ea3e28befc23de302f0c3 Mon Sep 17 00:00:00 2001 From: mitama Date: Tue, 7 May 2019 08:37:07 +0900 Subject: [PATCH 1/4] refactor: {Repr => Synonym} --- include/dimensional/arithmetic.hpp | 2 +- .../derived_units/absorbed_dose.hpp | 4 +- .../derived_units/absorbed_dose_rate.hpp | 4 +- .../derived_units/acceleration.hpp | 4 +- include/dimensional/derived_units/action.hpp | 4 +- .../derived_units/angular_acceleration.hpp | 4 +- .../derived_units/angular_momentum.hpp | 4 +- .../derived_units/angular_velocity.hpp | 4 +- .../derived_units/area_density.hpp | 4 +- .../dimensional/derived_units/capacitance.hpp | 4 +- .../derived_units/catalytic_activity.hpp | 4 +- .../derived_units/catalytic_efficiency.hpp | 4 +- .../derived_units/compressibility.hpp | 4 +- .../dimensional/derived_units/conductance.hpp | 4 +- include/dimensional/derived_units/crackle.hpp | 4 +- include/dimensional/derived_units/density.hpp | 4 +- .../derived_units/diffusion_coefficient.hpp | 4 +- .../derived_units/dynamic_viscosity.hpp | 4 +- .../derived_units/electric_charge.hpp | 4 +- .../derived_units/electric_charge_density.hpp | 4 +- .../electric_current_density.hpp | 4 +- .../electric_displacement_field.hpp | 4 +- .../derived_units/electric_field_strength.hpp | 4 +- .../derived_units/electric_potential.hpp | 4 +- .../derived_units/electrical_conductivity.hpp | 4 +- .../derived_units/electron_mobility.hpp | 4 +- include/dimensional/derived_units/energy.hpp | 4 +- .../derived_units/energy_density.hpp | 4 +- .../derived_units/energy_flux_density.hpp | 4 +- include/dimensional/derived_units/entropy.hpp | 4 +- .../dimensional/derived_units/exposure.hpp | 4 +- include/dimensional/derived_units/force.hpp | 4 +- .../derived_units/fuel_efficiency.hpp | 4 +- include/dimensional/derived_units/heat.hpp | 4 +- .../derived_units/heat_capacity.hpp | 4 +- .../dimensional/derived_units/heat_flux.hpp | 4 +- .../derived_units/heat_flux_density.hpp | 4 +- .../dimensional/derived_units/illuminance.hpp | 4 +- .../dimensional/derived_units/impedance.hpp | 4 +- include/dimensional/derived_units/impulse.hpp | 4 +- .../dimensional/derived_units/inductance.hpp | 4 +- .../dimensional/derived_units/irradiance.hpp | 4 +- include/dimensional/derived_units/jerk.hpp | 4 +- .../derived_units/kinematic_viscosity.hpp | 4 +- .../derived_units/linear_charge_density.hpp | 4 +- .../derived_units/linear_mass_density.hpp | 4 +- .../dimensional/derived_units/luminance.hpp | 4 +- .../derived_units/luminous_efficacy.hpp | 4 +- .../derived_units/luminous_energy.hpp | 4 +- .../derived_units/luminous_exposure.hpp | 4 +- .../derived_units/luminous_flux.hpp | 4 +- .../derived_units/magnetic_dipole_moment.hpp | 4 +- .../derived_units/magnetic_field_strength.hpp | 4 +- .../derived_units/magnetic_flux.hpp | 4 +- .../derived_units/magnetic_flux_density.hpp | 4 +- .../derived_units/magnetic_moment.hpp | 4 +- .../derived_units/magnetic_rigidity.hpp | 4 +- .../derived_units/magnetic_susceptibility.hpp | 4 +- .../magnetic_vector_potential.hpp | 4 +- .../derived_units/magnetization.hpp | 4 +- .../derived_units/magnetomotive_force.hpp | 4 +- .../derived_units/mass_flow_rate.hpp | 4 +- .../dimensional/derived_units/molality.hpp | 4 +- .../derived_units/molar_conductivity.hpp | 4 +- .../derived_units/molar_energy.hpp | 4 +- .../derived_units/molar_entropy.hpp | 4 +- .../derived_units/molar_heat_capacity.hpp | 4 +- .../dimensional/derived_units/molar_mass.hpp | 4 +- .../derived_units/molar_volume.hpp | 4 +- .../dimensional/derived_units/molarity.hpp | 4 +- .../derived_units/moment_of_inertia.hpp | 4 +- .../dimensional/derived_units/momentum.hpp | 4 +- .../derived_units/permeability.hpp | 4 +- .../derived_units/permittivity.hpp | 4 +- .../derived_units/polarization_density.hpp | 4 +- include/dimensional/derived_units/pop.hpp | 4 +- include/dimensional/derived_units/power.hpp | 4 +- .../derived_units/power_density.hpp | 4 +- .../dimensional/derived_units/pressure.hpp | 4 +- .../dimensional/derived_units/radiance.hpp | 4 +- .../derived_units/radiant_exposure.hpp | 4 +- .../derived_units/radiant_flux.hpp | 4 +- .../derived_units/radiant_intensity.hpp | 4 +- .../dimensional/derived_units/reactance.hpp | 4 +- .../dimensional/derived_units/resistance.hpp | 4 +- .../dimensional/derived_units/resistivity.hpp | 4 +- include/dimensional/derived_units/snap.hpp | 4 +- .../specific_angular_momentum.hpp | 4 +- .../derived_units/specific_energy.hpp | 4 +- .../derived_units/specific_entropy.hpp | 4 +- .../derived_units/specific_heat_capacity.hpp | 4 +- .../derived_units/specific_volume.hpp | 4 +- .../derived_units/spectral_intensity.hpp | 4 +- .../derived_units/spectral_irradiance.hpp | 4 +- .../derived_units/spectral_power.hpp | 4 +- .../derived_units/spectral_radiance.hpp | 4 +- .../dimensional/derived_units/stiffness.hpp | 4 +- .../derived_units/surface_tension.hpp | 4 +- .../derived_units/temperature_gradient.hpp | 4 +- .../derived_units/thermal_conductivity.hpp | 4 +- .../derived_units/thermal_diffusivity.hpp | 4 +- .../derived_units/thermal_resistance.hpp | 4 +- include/dimensional/derived_units/torque.hpp | 4 +- .../dimensional/derived_units/velocity.hpp | 4 +- include/dimensional/derived_units/voltage.hpp | 4 +- .../derived_units/volumetric_flow.hpp | 4 +- include/dimensional/derived_units/weight.hpp | 4 +- include/dimensional/derived_units/work.hpp | 4 +- include/dimensional/dimensional_phantom.hpp | 4 +- include/dimensional/dimensional_traits.hpp | 22 ++++----- include/dimensional/expr.hpp | 22 ++++----- include/dimensional/io.hpp | 25 +++++----- include/dimensional/math/abs.hpp | 4 +- include/dimensional/math/logarithm.hpp | 24 +++++----- include/dimensional/math/modular.hpp | 28 +++++------ include/dimensional/math/nearest_integer.hpp | 48 +++++++++---------- include/dimensional/math/pow.hpp | 24 +++++----- include/dimensional/math/root.hpp | 12 ++--- include/dimensional/mitamagic/quotient.hpp | 36 +++++++------- include/dimensional/prefix.hpp | 6 +-- include/dimensional/quantity.hpp | 34 ++++++------- include/dimensional/refinement.hpp | 4 +- include/dimensional/units.hpp | 4 +- .../division-tests/division-tests.cpp | 14 +++--- .../multiply-tests/multiply-tests.cpp | 14 +++--- 125 files changed, 378 insertions(+), 377 deletions(-) diff --git a/include/dimensional/arithmetic.hpp b/include/dimensional/arithmetic.hpp index 7cc20fac..2da1e6a8 100644 --- a/include/dimensional/arithmetic.hpp +++ b/include/dimensional/arithmetic.hpp @@ -123,7 +123,7 @@ constexpr auto operator/(typename std::decay_t::value_type const& lhs, R&& rhs) { return quantity_t< - si_base_units_repr::dimension_type>>, + si_base_units::dimension_type>>, typename std::decay_t::value_type > { lhs / std::forward(rhs).value() }; diff --git a/include/dimensional/derived_units/absorbed_dose.hpp b/include/dimensional/derived_units/absorbed_dose.hpp index ee1fb30e..0a706835 100644 --- a/include/dimensional/derived_units/absorbed_dose.hpp +++ b/include/dimensional/derived_units/absorbed_dose.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct absorbed_dose_repr{}; -using absorbed_dose_t = make_synonym_t * second<-2>)>; +template struct absorbed_dose_synonym{}; +using absorbed_dose_t = make_synonym_t * second<-2>)>; inline constexpr absorbed_dose_t gray{}; using absorbed_dose_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/absorbed_dose_rate.hpp b/include/dimensional/derived_units/absorbed_dose_rate.hpp index 3701e041..57d5a79e 100644 --- a/include/dimensional/derived_units/absorbed_dose_rate.hpp +++ b/include/dimensional/derived_units/absorbed_dose_rate.hpp @@ -7,9 +7,9 @@ #include "absorbed_dose.hpp" namespace mitama::si { -template < class > struct absorbed_dose_rate_repr{}; +template < class > struct absorbed_dose_rate_synonym{}; -using absorbed_dose_rate_t = make_synonym_t)>; +using absorbed_dose_rate_t = make_synonym_t)>; inline constexpr absorbed_dose_rate_t absorbed_dose_rate{}; using absorbed_dose_rate_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/acceleration.hpp b/include/dimensional/derived_units/acceleration.hpp index f3f9ceb2..49ca628b 100644 --- a/include/dimensional/derived_units/acceleration.hpp +++ b/include/dimensional/derived_units/acceleration.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct acceleration_repr{}; -using acceleration_t = make_synonym_t)>; +template struct acceleration_synonym{}; +using acceleration_t = make_synonym_t)>; inline constexpr acceleration_t acceleration{}; using acceleration_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/action.hpp b/include/dimensional/derived_units/action.hpp index a623b0bf..481583e2 100644 --- a/include/dimensional/derived_units/action.hpp +++ b/include/dimensional/derived_units/action.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct action_repr{}; -using action_t = make_synonym_t * kilogram<> * second<-1>)>; +template struct action_synonym{}; +using action_t = make_synonym_t * kilogram<> * second<-1>)>; inline constexpr action_t action{}; using action_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/angular_acceleration.hpp b/include/dimensional/derived_units/angular_acceleration.hpp index 9f37fbfa..21a2bb63 100644 --- a/include/dimensional/derived_units/angular_acceleration.hpp +++ b/include/dimensional/derived_units/angular_acceleration.hpp @@ -7,8 +7,8 @@ #include "angle.hpp" namespace mitama::si { -template struct angular_acceleration_repr{}; -using angular_acceleration_t = make_synonym_t)>; +template struct angular_acceleration_synonym{}; +using angular_acceleration_t = make_synonym_t)>; inline constexpr angular_acceleration_t angular_acceleration{}; using angular_acceleration_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/angular_momentum.hpp b/include/dimensional/derived_units/angular_momentum.hpp index 93ef4e09..af4b1af8 100644 --- a/include/dimensional/derived_units/angular_momentum.hpp +++ b/include/dimensional/derived_units/angular_momentum.hpp @@ -6,8 +6,8 @@ #include "../refinement.hpp" namespace mitama::si { -template struct angular_momentum_repr{}; -using angular_momentum_t = make_synonym_t * kilogram<> * second<-1>)>; +template struct angular_momentum_synonym{}; +using angular_momentum_t = make_synonym_t * kilogram<> * second<-1>)>; inline constexpr angular_momentum_t angular_momentum{}; using angular_momentum_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/angular_velocity.hpp b/include/dimensional/derived_units/angular_velocity.hpp index 62d80129..e3490816 100644 --- a/include/dimensional/derived_units/angular_velocity.hpp +++ b/include/dimensional/derived_units/angular_velocity.hpp @@ -8,8 +8,8 @@ namespace mitama::si { -template struct angular_velocity_repr{}; -using angular_velocity_t = make_synonym_t; +template struct angular_velocity_synonym{}; +using angular_velocity_t = make_synonym_t; inline constexpr angular_velocity_t angular_velocity{}; using angular_velocity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/area_density.hpp b/include/dimensional/derived_units/area_density.hpp index 5cfe1a10..6676352d 100644 --- a/include/dimensional/derived_units/area_density.hpp +++ b/include/dimensional/derived_units/area_density.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct area_density_repr{}; -using area_density_t = make_synonym_t * kilogram<>)>; +template struct area_density_synonym{}; +using area_density_t = make_synonym_t * kilogram<>)>; inline constexpr area_density_t area_density{}; using area_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/capacitance.hpp b/include/dimensional/derived_units/capacitance.hpp index a2202f84..82123daf 100644 --- a/include/dimensional/derived_units/capacitance.hpp +++ b/include/dimensional/derived_units/capacitance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct capacitance_repr{}; -using capacitance_t = make_synonym_t * meter<-2> * second<4> * ampere<2>)>; +template struct capacitance_synonym{}; +using capacitance_t = make_synonym_t * meter<-2> * second<4> * ampere<2>)>; inline constexpr capacitance_t farad{}; using capacitance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/catalytic_activity.hpp b/include/dimensional/derived_units/catalytic_activity.hpp index 4de7472f..ddfbf86a 100644 --- a/include/dimensional/derived_units/catalytic_activity.hpp +++ b/include/dimensional/derived_units/catalytic_activity.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct catalytic_activity_repr{}; -using catalytic_activity_t = make_synonym_t * mol<>)>; +template struct catalytic_activity_synonym{}; +using catalytic_activity_t = make_synonym_t * mol<>)>; inline constexpr catalytic_activity_t katal{}; using catalytic_activity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/catalytic_efficiency.hpp b/include/dimensional/derived_units/catalytic_efficiency.hpp index 1bb13af2..1faeab5b 100644 --- a/include/dimensional/derived_units/catalytic_efficiency.hpp +++ b/include/dimensional/derived_units/catalytic_efficiency.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct catalytic_efficiency_repr{}; -using catalytic_efficiency_t = make_synonym_t / (mol<> * second<>))>; +template struct catalytic_efficiency_synonym{}; +using catalytic_efficiency_t = make_synonym_t / (mol<> * second<>))>; inline constexpr catalytic_efficiency_t catalytic_efficiency{}; using catalytic_efficiency_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/compressibility.hpp b/include/dimensional/derived_units/compressibility.hpp index 0922e4d3..b9ac4a6c 100644 --- a/include/dimensional/derived_units/compressibility.hpp +++ b/include/dimensional/derived_units/compressibility.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct compressibility_repr{}; -using compressibility_t = make_synonym_t * kilogram<-1> * second<2>)>; +template struct compressibility_synonym{}; +using compressibility_t = make_synonym_t * kilogram<-1> * second<2>)>; inline constexpr compressibility_t compressibility{}; using compressibility_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/conductance.hpp b/include/dimensional/derived_units/conductance.hpp index a41af290..e36e575f 100644 --- a/include/dimensional/derived_units/conductance.hpp +++ b/include/dimensional/derived_units/conductance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct conductance_repr{}; -using conductance_t = make_synonym_t * meter<-2> * second<3> * ampere<2>)>; +template struct conductance_synonym{}; +using conductance_t = make_synonym_t * meter<-2> * second<3> * ampere<2>)>; inline constexpr conductance_t siemens{}; using conductance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/crackle.hpp b/include/dimensional/derived_units/crackle.hpp index c2718994..0a49dc9b 100644 --- a/include/dimensional/derived_units/crackle.hpp +++ b/include/dimensional/derived_units/crackle.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct crackle_repr{}; -using crackle_t = make_synonym_t)>; +template struct crackle_synonym{}; +using crackle_t = make_synonym_t)>; inline constexpr crackle_t crackle{}; using crackle_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/density.hpp b/include/dimensional/derived_units/density.hpp index 6fe6c1cc..dbab8a87 100644 --- a/include/dimensional/derived_units/density.hpp +++ b/include/dimensional/derived_units/density.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct density_repr{}; -using density_t = make_synonym_t * kilogram<>)>; +template struct density_synonym{}; +using density_t = make_synonym_t * kilogram<>)>; inline constexpr density_t density{}; using density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/diffusion_coefficient.hpp b/include/dimensional/derived_units/diffusion_coefficient.hpp index 6df89b66..1ad446f4 100644 --- a/include/dimensional/derived_units/diffusion_coefficient.hpp +++ b/include/dimensional/derived_units/diffusion_coefficient.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct diffusion_coefficient_repr{}; -using diffusion_coefficient_t = make_synonym_t / second<1>)>; +template struct diffusion_coefficient_synonym{}; +using diffusion_coefficient_t = make_synonym_t / second<1>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_THERMAL_DIFFUSIVITY_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_KINEMATIC_VISCOSITY_HPP) inline constexpr diffusion_coefficient_t diffusion_coefficient{}; diff --git a/include/dimensional/derived_units/dynamic_viscosity.hpp b/include/dimensional/derived_units/dynamic_viscosity.hpp index b04a0269..f8cc344c 100644 --- a/include/dimensional/derived_units/dynamic_viscosity.hpp +++ b/include/dimensional/derived_units/dynamic_viscosity.hpp @@ -7,8 +7,8 @@ #include "pressure.hpp" namespace mitama::si { -template struct dynamic_viscosity_repr{}; -using dynamic_viscosity_t = make_synonym_t; +template struct dynamic_viscosity_synonym{}; +using dynamic_viscosity_t = make_synonym_t; inline constexpr dynamic_viscosity_t dynamic_viscosity{}; using dynamic_viscosity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electric_charge.hpp b/include/dimensional/derived_units/electric_charge.hpp index 8ed03030..f287f9c8 100644 --- a/include/dimensional/derived_units/electric_charge.hpp +++ b/include/dimensional/derived_units/electric_charge.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct electric_charge_repr{}; -using electric_charge_t = make_synonym_t * ampere<>)>; +template struct electric_charge_synonym{}; +using electric_charge_t = make_synonym_t * ampere<>)>; inline constexpr electric_charge_t coulomb{}; using electric_charge_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electric_charge_density.hpp b/include/dimensional/derived_units/electric_charge_density.hpp index f5e886be..7a023ca9 100644 --- a/include/dimensional/derived_units/electric_charge_density.hpp +++ b/include/dimensional/derived_units/electric_charge_density.hpp @@ -7,8 +7,8 @@ #include "electric_charge.hpp" namespace mitama::si { -template struct electric_charge_density_repr{}; -using electric_charge_density_t = make_synonym_t)>; +template struct electric_charge_density_synonym{}; +using electric_charge_density_t = make_synonym_t)>; inline constexpr electric_charge_density_t electric_charge_density{}; using electric_charge_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electric_current_density.hpp b/include/dimensional/derived_units/electric_current_density.hpp index dc53cc25..18410216 100644 --- a/include/dimensional/derived_units/electric_current_density.hpp +++ b/include/dimensional/derived_units/electric_current_density.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct electric_current_density_repr{}; -using electric_current_density_t = make_synonym_t / meter<2>)>; +template struct electric_current_density_synonym{}; +using electric_current_density_t = make_synonym_t / meter<2>)>; inline constexpr electric_current_density_t electric_current_density{}; using electric_current_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electric_displacement_field.hpp b/include/dimensional/derived_units/electric_displacement_field.hpp index 9ef63564..25f90fcd 100644 --- a/include/dimensional/derived_units/electric_displacement_field.hpp +++ b/include/dimensional/derived_units/electric_displacement_field.hpp @@ -7,8 +7,8 @@ #include "electric_charge.hpp" namespace mitama::si { -template struct electric_displacement_field_repr{}; -using electric_displacement_field_t = make_synonym_t)>; +template struct electric_displacement_field_synonym{}; +using electric_displacement_field_t = make_synonym_t)>; inline constexpr electric_displacement_field_t electric_displacement_field{}; using electric_displacement_field_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electric_field_strength.hpp b/include/dimensional/derived_units/electric_field_strength.hpp index 2f1e14b1..e57ff93e 100644 --- a/include/dimensional/derived_units/electric_field_strength.hpp +++ b/include/dimensional/derived_units/electric_field_strength.hpp @@ -7,8 +7,8 @@ #include "voltage.hpp" namespace mitama::si { -template struct electric_field_strength_repr{}; -using electric_field_strength_t = make_synonym_t; +template struct electric_field_strength_synonym{}; +using electric_field_strength_t = make_synonym_t; inline constexpr electric_field_strength_t electric_field_strength{}; using electric_field_strength_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electric_potential.hpp b/include/dimensional/derived_units/electric_potential.hpp index 5198fbdc..4d978412 100644 --- a/include/dimensional/derived_units/electric_potential.hpp +++ b/include/dimensional/derived_units/electric_potential.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct electric_potential_repr{}; -using electric_potential_t = make_synonym_t * meter<2> * second<-3> * ampere<-1>)>; +template struct electric_potential_synonym{}; +using electric_potential_t = make_synonym_t * meter<2> * second<-3> * ampere<-1>)>; #ifndef MITAMA_DIMENSIONAL_DERIVED_UNITS_VOLTAGE_HPP inline constexpr electric_potential_t volts{}; diff --git a/include/dimensional/derived_units/electrical_conductivity.hpp b/include/dimensional/derived_units/electrical_conductivity.hpp index ca2cfc9c..3914d908 100644 --- a/include/dimensional/derived_units/electrical_conductivity.hpp +++ b/include/dimensional/derived_units/electrical_conductivity.hpp @@ -7,8 +7,8 @@ #include "conductance.hpp" namespace mitama::si { -template struct electrical_conductivity_repr{}; -using electrical_conductivity_t = make_synonym_t)>; +template struct electrical_conductivity_synonym{}; +using electrical_conductivity_t = make_synonym_t)>; inline constexpr electrical_conductivity_t electrical_conductivity{}; using electrical_conductivity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/electron_mobility.hpp b/include/dimensional/derived_units/electron_mobility.hpp index 2af802d1..9271f146 100644 --- a/include/dimensional/derived_units/electron_mobility.hpp +++ b/include/dimensional/derived_units/electron_mobility.hpp @@ -7,8 +7,8 @@ #include "voltage.hpp" namespace mitama::si { -template struct electron_mobility_repr{}; -using electron_mobility_t = make_synonym_t * volt<-1> * second<-1> )>; +template struct electron_mobility_synonym{}; +using electron_mobility_t = make_synonym_t * volt<-1> * second<-1> )>; inline constexpr electron_mobility_t electron_mobility{}; using electron_mobility_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/energy.hpp b/include/dimensional/derived_units/energy.hpp index 54f7ddd8..3e9c4703 100644 --- a/include/dimensional/derived_units/energy.hpp +++ b/include/dimensional/derived_units/energy.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct energy_repr{}; -using energy_t = make_synonym_t * meter<2> * second<-2>)>; +template struct energy_synonym{}; +using energy_t = make_synonym_t * meter<2> * second<-2>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_HEAT_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_WORK_HPP) inline constexpr energy_t joule{}; diff --git a/include/dimensional/derived_units/energy_density.hpp b/include/dimensional/derived_units/energy_density.hpp index 64640e76..78cdfc3f 100644 --- a/include/dimensional/derived_units/energy_density.hpp +++ b/include/dimensional/derived_units/energy_density.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct energy_density_repr{}; -using energy_density_t = make_synonym_t)>; +template struct energy_density_synonym{}; +using energy_density_t = make_synonym_t)>; inline constexpr energy_density_t energy_density{}; using energy_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/energy_flux_density.hpp b/include/dimensional/derived_units/energy_flux_density.hpp index 0bab35f2..ea2a6246 100644 --- a/include/dimensional/derived_units/energy_flux_density.hpp +++ b/include/dimensional/derived_units/energy_flux_density.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct energy_flux_density_repr{}; -using energy_flux_density_t = make_synonym_t * second<-1> )>; +template struct energy_flux_density_synonym{}; +using energy_flux_density_t = make_synonym_t * second<-1> )>; inline constexpr energy_flux_density_t energy_flux_density{}; using energy_flux_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/entropy.hpp b/include/dimensional/derived_units/entropy.hpp index 28018956..21018c0b 100644 --- a/include/dimensional/derived_units/entropy.hpp +++ b/include/dimensional/derived_units/entropy.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct entropy_repr{}; -using entropy_t = make_synonym_t; +template struct entropy_synonym{}; +using entropy_t = make_synonym_t; inline constexpr entropy_t entropy{}; using entropy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/exposure.hpp b/include/dimensional/derived_units/exposure.hpp index e0c5680c..92ebff6f 100644 --- a/include/dimensional/derived_units/exposure.hpp +++ b/include/dimensional/derived_units/exposure.hpp @@ -7,8 +7,8 @@ #include "electric_charge.hpp" namespace mitama::si { -template struct exposure_repr{}; -using exposure_t = make_synonym_t)>; +template struct exposure_synonym{}; +using exposure_t = make_synonym_t)>; inline constexpr exposure_t exposure{}; using exposure_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/force.hpp b/include/dimensional/derived_units/force.hpp index 2aa29fc8..d87718eb 100644 --- a/include/dimensional/derived_units/force.hpp +++ b/include/dimensional/derived_units/force.hpp @@ -6,8 +6,8 @@ #include "../refinement.hpp" namespace mitama::si { -template struct force_repr{}; -using force_t = make_synonym_t * meter<> * second<-2>)>; +template struct force_synonym{}; +using force_t = make_synonym_t * meter<> * second<-2>)>; #ifndef MITAMA_DIMENSIONAL_DERIVED_UNITS_WEIGHT_HPP inline constexpr force_t newton{}; using force_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/fuel_efficiency.hpp b/include/dimensional/derived_units/fuel_efficiency.hpp index 439aa859..9b02ef40 100644 --- a/include/dimensional/derived_units/fuel_efficiency.hpp +++ b/include/dimensional/derived_units/fuel_efficiency.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct fuel_efficiency_repr{}; -using fuel_efficiency_t = make_synonym_t)>; +template struct fuel_efficiency_synonym{}; +using fuel_efficiency_t = make_synonym_t)>; inline constexpr fuel_efficiency_t fuel_efficiency{}; using fuel_efficiency_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/heat.hpp b/include/dimensional/derived_units/heat.hpp index 6696c4e6..a79b6249 100644 --- a/include/dimensional/derived_units/heat.hpp +++ b/include/dimensional/derived_units/heat.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct heat_repr{}; -using heat_t = make_synonym_t * meter<2> * second<-2>)>; +template struct heat_synonym{}; +using heat_t = make_synonym_t * meter<2> * second<-2>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_ENERGY_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_WORK_HPP) inline constexpr heat_t joule{}; diff --git a/include/dimensional/derived_units/heat_capacity.hpp b/include/dimensional/derived_units/heat_capacity.hpp index 1a8e6bc9..19dd3724 100644 --- a/include/dimensional/derived_units/heat_capacity.hpp +++ b/include/dimensional/derived_units/heat_capacity.hpp @@ -8,8 +8,8 @@ namespace mitama::si { -template struct heat_capacity_repr{}; -using heat_capacity_t = make_synonym_t; +template struct heat_capacity_synonym{}; +using heat_capacity_t = make_synonym_t; inline constexpr heat_capacity_t heat_capacity{}; using heat_capacity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/heat_flux.hpp b/include/dimensional/derived_units/heat_flux.hpp index d6bf8841..db741911 100644 --- a/include/dimensional/derived_units/heat_flux.hpp +++ b/include/dimensional/derived_units/heat_flux.hpp @@ -7,8 +7,8 @@ #include "./power.hpp" namespace mitama::si { -template struct heat_flux_repr{}; -using heat_flux_t = make_synonym_t)>; +template struct heat_flux_synonym{}; +using heat_flux_t = make_synonym_t)>; inline constexpr heat_flux_t heat_flux{}; using heat_flux_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/heat_flux_density.hpp b/include/dimensional/derived_units/heat_flux_density.hpp index 53e1c2fd..85a81f18 100644 --- a/include/dimensional/derived_units/heat_flux_density.hpp +++ b/include/dimensional/derived_units/heat_flux_density.hpp @@ -7,8 +7,8 @@ #include "power.hpp" namespace mitama::si { -template struct heat_flux_density_repr{}; -using heat_flux_density_t = make_synonym_t)>; +template struct heat_flux_density_synonym{}; +using heat_flux_density_t = make_synonym_t)>; inline constexpr heat_flux_density_t heat_flux_density{}; using heat_flux_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/illuminance.hpp b/include/dimensional/derived_units/illuminance.hpp index 566fa422..6abcb0db 100644 --- a/include/dimensional/derived_units/illuminance.hpp +++ b/include/dimensional/derived_units/illuminance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct illuminance_repr{}; -using illuminance_t = make_synonym_t * candela<>)>; +template struct illuminance_synonym{}; +using illuminance_t = make_synonym_t * candela<>)>; inline constexpr illuminance_t lux{}; using illuminance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/impedance.hpp b/include/dimensional/derived_units/impedance.hpp index b6e865ed..9e6d6081 100644 --- a/include/dimensional/derived_units/impedance.hpp +++ b/include/dimensional/derived_units/impedance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct impedance_repr{}; -using impedance_t = make_synonym_t * meter<2> * second<-3> * ampere<-2>)>; +template struct impedance_synonym{}; +using impedance_t = make_synonym_t * meter<2> * second<-3> * ampere<-2>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_RESISTANCE_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_REACTANCE_HPP) inline constexpr impedance_t ohm{}; diff --git a/include/dimensional/derived_units/impulse.hpp b/include/dimensional/derived_units/impulse.hpp index 497cff53..87f4e195 100644 --- a/include/dimensional/derived_units/impulse.hpp +++ b/include/dimensional/derived_units/impulse.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct impulse_repr{}; -using impulse_t = make_synonym_t * kilogram<> * second<-1>)>; +template struct impulse_synonym{}; +using impulse_t = make_synonym_t * kilogram<> * second<-1>)>; inline constexpr impulse_t impulse{}; using impulse_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/inductance.hpp b/include/dimensional/derived_units/inductance.hpp index f0f75e11..9e149c52 100644 --- a/include/dimensional/derived_units/inductance.hpp +++ b/include/dimensional/derived_units/inductance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct inductance_repr{}; -using inductance_t = make_synonym_t * meter<2> * second<-2> * ampere<-2>)>; +template struct inductance_synonym{}; +using inductance_t = make_synonym_t * meter<2> * second<-2> * ampere<-2>)>; inline constexpr inductance_t henry{}; using inductance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/irradiance.hpp b/include/dimensional/derived_units/irradiance.hpp index 836974b7..05181133 100644 --- a/include/dimensional/derived_units/irradiance.hpp +++ b/include/dimensional/derived_units/irradiance.hpp @@ -7,8 +7,8 @@ #include "power.hpp" namespace mitama::si { -template struct irradiance_repr{}; -using irradiance_t = make_synonym_t)>; +template struct irradiance_synonym{}; +using irradiance_t = make_synonym_t)>; #ifndef MITAMA_DIMENSIONAL_DERIVED_UNITS_HEAT_FLUX_DENSITY_HPP inline constexpr irradiance_t irradiance{}; diff --git a/include/dimensional/derived_units/jerk.hpp b/include/dimensional/derived_units/jerk.hpp index 62f3f3f5..4d05d126 100644 --- a/include/dimensional/derived_units/jerk.hpp +++ b/include/dimensional/derived_units/jerk.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct jerk_repr{}; -using jerk_t = make_synonym_t)>; +template struct jerk_synonym{}; +using jerk_t = make_synonym_t)>; inline constexpr jerk_t jerk{}; using jerk_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/kinematic_viscosity.hpp b/include/dimensional/derived_units/kinematic_viscosity.hpp index d26605ff..3d11f475 100644 --- a/include/dimensional/derived_units/kinematic_viscosity.hpp +++ b/include/dimensional/derived_units/kinematic_viscosity.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct kinematic_viscosity_repr{}; -using kinematic_viscosity_t = make_synonym_t / second<1>)>; +template struct kinematic_viscosity_synonym{}; +using kinematic_viscosity_t = make_synonym_t / second<1>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_THERMAL_DIFFUSIVITY_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_DIFFUSION_COEFFICIENT_HPP) inline constexpr kinematic_viscosity_t kinematic_viscosity{}; diff --git a/include/dimensional/derived_units/linear_charge_density.hpp b/include/dimensional/derived_units/linear_charge_density.hpp index e3456302..bed1d41a 100644 --- a/include/dimensional/derived_units/linear_charge_density.hpp +++ b/include/dimensional/derived_units/linear_charge_density.hpp @@ -7,8 +7,8 @@ #include "electric_charge.hpp" namespace mitama::si { -template struct linear_charge_density_repr{}; -using linear_charge_density_t = make_synonym_t)>; +template struct linear_charge_density_synonym{}; +using linear_charge_density_t = make_synonym_t)>; inline constexpr linear_charge_density_t linear_charge_density{}; using linear_charge_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/linear_mass_density.hpp b/include/dimensional/derived_units/linear_mass_density.hpp index 61a41388..508c3255 100644 --- a/include/dimensional/derived_units/linear_mass_density.hpp +++ b/include/dimensional/derived_units/linear_mass_density.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct linear_mass_density_repr{}; -using linear_mass_density_t = make_synonym_t * kilogram<>)>; +template struct linear_mass_density_synonym{}; +using linear_mass_density_t = make_synonym_t * kilogram<>)>; inline constexpr linear_mass_density_t linear_mass_density{}; using linear_mass_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/luminance.hpp b/include/dimensional/derived_units/luminance.hpp index 0a248aa7..c7b6e204 100644 --- a/include/dimensional/derived_units/luminance.hpp +++ b/include/dimensional/derived_units/luminance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct luminance_repr{}; -using luminance_t = make_synonym_t * meter<-2>)>; +template struct luminance_synonym{}; +using luminance_t = make_synonym_t * meter<-2>)>; inline constexpr luminance_t luminance{}; using luminance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/luminous_efficacy.hpp b/include/dimensional/derived_units/luminous_efficacy.hpp index 3dda4bc5..8c34747d 100644 --- a/include/dimensional/derived_units/luminous_efficacy.hpp +++ b/include/dimensional/derived_units/luminous_efficacy.hpp @@ -8,8 +8,8 @@ #include "luminous_flux.hpp" namespace mitama::si { -template struct luminous_efficacy_repr{}; -using luminous_efficacy_t = make_synonym_t; +template struct luminous_efficacy_synonym{}; +using luminous_efficacy_t = make_synonym_t; inline constexpr luminous_efficacy_t luminous_efficacy{}; using luminous_efficacy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/luminous_energy.hpp b/include/dimensional/derived_units/luminous_energy.hpp index 38a9c357..63ce3d68 100644 --- a/include/dimensional/derived_units/luminous_energy.hpp +++ b/include/dimensional/derived_units/luminous_energy.hpp @@ -7,8 +7,8 @@ #include "luminous_flux.hpp" namespace mitama::si { -template struct luminous_energy_repr{}; -using luminous_energy_t = make_synonym_t)>; +template struct luminous_energy_synonym{}; +using luminous_energy_t = make_synonym_t)>; inline constexpr luminous_energy_t luminous_energy{}; using luminous_energy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/luminous_exposure.hpp b/include/dimensional/derived_units/luminous_exposure.hpp index ad7efe91..9f6ea100 100644 --- a/include/dimensional/derived_units/luminous_exposure.hpp +++ b/include/dimensional/derived_units/luminous_exposure.hpp @@ -7,8 +7,8 @@ #include "solid_angle.hpp" namespace mitama::si { -template struct luminous_exposure_repr{}; -using luminous_exposure_t = make_synonym_t*seconds*candelas*steradian)>; +template struct luminous_exposure_synonym{}; +using luminous_exposure_t = make_synonym_t*seconds*candela<>*steradian)>; inline constexpr luminous_exposure_t luminous_exposure{}; using luminous_exposure_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/luminous_flux.hpp b/include/dimensional/derived_units/luminous_flux.hpp index 58f469d4..e65a992e 100644 --- a/include/dimensional/derived_units/luminous_flux.hpp +++ b/include/dimensional/derived_units/luminous_flux.hpp @@ -7,8 +7,8 @@ #include "solid_angle.hpp" namespace mitama::si { -template struct luminous_flux_repr{}; -using luminous_flux_t = make_synonym_t * steradian)>; +template struct luminous_flux_synonym{}; +using luminous_flux_t = make_synonym_t * steradian)>; inline constexpr luminous_flux_t lumen{}; using luminous_flux_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_dipole_moment.hpp b/include/dimensional/derived_units/magnetic_dipole_moment.hpp index e3947186..9169ccc5 100644 --- a/include/dimensional/derived_units/magnetic_dipole_moment.hpp +++ b/include/dimensional/derived_units/magnetic_dipole_moment.hpp @@ -8,8 +8,8 @@ #include "magnetic_flux_density.hpp" namespace mitama::si { -template struct magnetic_dipole_moment_repr{}; -using magnetic_dipole_moment_t = make_synonym_t; +template struct magnetic_dipole_moment_synonym{}; +using magnetic_dipole_moment_t = make_synonym_t; inline constexpr magnetic_dipole_moment_t magnetic_dipole_moment{}; using magnetic_dipole_moment_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_field_strength.hpp b/include/dimensional/derived_units/magnetic_field_strength.hpp index 6a0640fe..fd0b0be8 100644 --- a/include/dimensional/derived_units/magnetic_field_strength.hpp +++ b/include/dimensional/derived_units/magnetic_field_strength.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct magnetic_field_strength_repr{}; -using magnetic_field_strength_t = make_synonym_t / meter<>)>; +template struct magnetic_field_strength_synonym{}; +using magnetic_field_strength_t = make_synonym_t / meter<>)>; inline constexpr magnetic_field_strength_t magnetic_field_strength{}; using magnetic_field_strength_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_flux.hpp b/include/dimensional/derived_units/magnetic_flux.hpp index 17812e59..ed623c93 100644 --- a/include/dimensional/derived_units/magnetic_flux.hpp +++ b/include/dimensional/derived_units/magnetic_flux.hpp @@ -6,8 +6,8 @@ #include "../refinement.hpp" namespace mitama::si { -template struct magnetic_flux_repr{}; -using magnetic_flux_t = make_synonym_t * meter<2> * second<-2> * ampere<-1>)>; +template struct magnetic_flux_synonym{}; +using magnetic_flux_t = make_synonym_t * meter<2> * second<-2> * ampere<-1>)>; inline constexpr magnetic_flux_t weber{}; using magnetic_flux_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_flux_density.hpp b/include/dimensional/derived_units/magnetic_flux_density.hpp index b05d0d75..e9cddb8c 100644 --- a/include/dimensional/derived_units/magnetic_flux_density.hpp +++ b/include/dimensional/derived_units/magnetic_flux_density.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct magnetic_flux_density_repr{}; -using magnetic_flux_density_t = make_synonym_t * second<-2> * ampere<-1>)>; +template struct magnetic_flux_density_synonym{}; +using magnetic_flux_density_t = make_synonym_t * second<-2> * ampere<-1>)>; inline constexpr magnetic_flux_density_t tesla{}; using magnetic_flux_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_moment.hpp b/include/dimensional/derived_units/magnetic_moment.hpp index 381e76c1..8db5fae0 100644 --- a/include/dimensional/derived_units/magnetic_moment.hpp +++ b/include/dimensional/derived_units/magnetic_moment.hpp @@ -7,8 +7,8 @@ #include "magnetic_flux.hpp" namespace mitama::si { -template struct magnetic_moment_repr{}; -using magnetic_moment_t = make_synonym_t)>; +template struct magnetic_moment_synonym{}; +using magnetic_moment_t = make_synonym_t)>; inline constexpr magnetic_moment_t magnetic_moment{}; using magnetic_moment_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_rigidity.hpp b/include/dimensional/derived_units/magnetic_rigidity.hpp index 75875785..ec9b5d6e 100644 --- a/include/dimensional/derived_units/magnetic_rigidity.hpp +++ b/include/dimensional/derived_units/magnetic_rigidity.hpp @@ -7,8 +7,8 @@ #include "magnetic_flux_density.hpp" namespace mitama::si { -template struct magnetic_rigidity_repr{}; -using magnetic_rigidity_t = make_synonym_t)>; +template struct magnetic_rigidity_synonym{}; +using magnetic_rigidity_t = make_synonym_t)>; inline constexpr magnetic_rigidity_t magnetic_rigidity{}; using magnetic_rigidity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_susceptibility.hpp b/include/dimensional/derived_units/magnetic_susceptibility.hpp index e69f015f..b646f5e1 100644 --- a/include/dimensional/derived_units/magnetic_susceptibility.hpp +++ b/include/dimensional/derived_units/magnetic_susceptibility.hpp @@ -7,8 +7,8 @@ #include "inductance.hpp" namespace mitama::si { -template struct magnetic_susceptibility_repr{}; -using magnetic_susceptibility_t = make_synonym_t / henry)>; +template struct magnetic_susceptibility_synonym{}; +using magnetic_susceptibility_t = make_synonym_t / henry)>; inline constexpr magnetic_susceptibility_t magnetic_susceptibility{}; using magnetic_susceptibility_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetic_vector_potential.hpp b/include/dimensional/derived_units/magnetic_vector_potential.hpp index 1929698e..f38e031e 100644 --- a/include/dimensional/derived_units/magnetic_vector_potential.hpp +++ b/include/dimensional/derived_units/magnetic_vector_potential.hpp @@ -7,8 +7,8 @@ #include "magnetic_flux.hpp" namespace mitama::si { -template struct magnetic_vector_potential_repr{}; -using magnetic_vector_potential_t = make_synonym_t)>; +template struct magnetic_vector_potential_synonym{}; +using magnetic_vector_potential_t = make_synonym_t)>; inline constexpr magnetic_vector_potential_t magnetic_vector_potential{}; using magnetic_vector_potential_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetization.hpp b/include/dimensional/derived_units/magnetization.hpp index d60945e9..129d6309 100644 --- a/include/dimensional/derived_units/magnetization.hpp +++ b/include/dimensional/derived_units/magnetization.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct magnetization_repr{}; -using magnetization_t = make_synonym_t / meter<>)>; +template struct magnetization_synonym{}; +using magnetization_t = make_synonym_t / meter<>)>; inline constexpr magnetization_t magnetization{}; using magnetization_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/magnetomotive_force.hpp b/include/dimensional/derived_units/magnetomotive_force.hpp index 223e3203..79c6245d 100644 --- a/include/dimensional/derived_units/magnetomotive_force.hpp +++ b/include/dimensional/derived_units/magnetomotive_force.hpp @@ -7,8 +7,8 @@ #include "angle.hpp" namespace mitama::si { -template struct magnetomotive_force_repr{}; -using magnetomotive_force_t = make_synonym_t * radian)>; +template struct magnetomotive_force_synonym{}; +using magnetomotive_force_t = make_synonym_t * radian)>; inline constexpr magnetomotive_force_t magnetomotive_force{}; using magnetomotive_force_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/mass_flow_rate.hpp b/include/dimensional/derived_units/mass_flow_rate.hpp index 1ef5b142..1c1df013 100644 --- a/include/dimensional/derived_units/mass_flow_rate.hpp +++ b/include/dimensional/derived_units/mass_flow_rate.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct mass_flow_rate_repr{}; -using mass_flow_rate_t = make_synonym_t / second<>)>; +template struct mass_flow_rate_synonym{}; +using mass_flow_rate_t = make_synonym_t / second<>)>; inline constexpr mass_flow_rate_t mass_flow_rate{}; using mass_flow_rate_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molality.hpp b/include/dimensional/derived_units/molality.hpp index 50d1c4fa..c1395e67 100644 --- a/include/dimensional/derived_units/molality.hpp +++ b/include/dimensional/derived_units/molality.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct molality_repr{}; -using molality_t = make_synonym_t / kilogram<>)>; +template struct molality_synonym{}; +using molality_t = make_synonym_t / kilogram<>)>; inline constexpr molality_t molality{}; using molality_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molar_conductivity.hpp b/include/dimensional/derived_units/molar_conductivity.hpp index 7cc0b62f..91e3a203 100644 --- a/include/dimensional/derived_units/molar_conductivity.hpp +++ b/include/dimensional/derived_units/molar_conductivity.hpp @@ -7,8 +7,8 @@ #include "conductance.hpp" namespace mitama::si { -template struct molar_conductivity_repr{}; -using molar_conductivity_t = make_synonym_t / mol<>)>; +template struct molar_conductivity_synonym{}; +using molar_conductivity_t = make_synonym_t / mol<>)>; inline constexpr molar_conductivity_t molar_conductivity{}; using molar_conductivity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molar_energy.hpp b/include/dimensional/derived_units/molar_energy.hpp index b2564774..e4ca204f 100644 --- a/include/dimensional/derived_units/molar_energy.hpp +++ b/include/dimensional/derived_units/molar_energy.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct molar_energy_repr{}; -using molar_energy_t = make_synonym_t)>; +template struct molar_energy_synonym{}; +using molar_energy_t = make_synonym_t)>; inline constexpr molar_energy_t molar_energy{}; using molar_energy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molar_entropy.hpp b/include/dimensional/derived_units/molar_entropy.hpp index 3ece1035..9a2736c1 100644 --- a/include/dimensional/derived_units/molar_entropy.hpp +++ b/include/dimensional/derived_units/molar_entropy.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct molar_entropy_repr{}; -using molar_entropy_t = make_synonym_t * mol<>) )>; +template struct molar_entropy_synonym{}; +using molar_entropy_t = make_synonym_t * mol<>) )>; inline constexpr molar_entropy_t molar_entropy{}; using molar_entropy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molar_heat_capacity.hpp b/include/dimensional/derived_units/molar_heat_capacity.hpp index 562e9a21..89171e88 100644 --- a/include/dimensional/derived_units/molar_heat_capacity.hpp +++ b/include/dimensional/derived_units/molar_heat_capacity.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct molar_heat_capacity_repr{}; -using molar_heat_capacity_t = make_synonym_t * mol<>) )>; +template struct molar_heat_capacity_synonym{}; +using molar_heat_capacity_t = make_synonym_t * mol<>) )>; inline constexpr molar_heat_capacity_t molar_heat_capacity{}; using molar_heat_capacity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molar_mass.hpp b/include/dimensional/derived_units/molar_mass.hpp index 2647d4e0..709fa33a 100644 --- a/include/dimensional/derived_units/molar_mass.hpp +++ b/include/dimensional/derived_units/molar_mass.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct molar_mass_repr{}; -using molar_mass_t = make_synonym_t / mol<>)>; +template struct molar_mass_synonym{}; +using molar_mass_t = make_synonym_t / mol<>)>; inline constexpr molar_mass_t molar_mass{}; using molar_mass_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molar_volume.hpp b/include/dimensional/derived_units/molar_volume.hpp index f1f12514..90f0cd8c 100644 --- a/include/dimensional/derived_units/molar_volume.hpp +++ b/include/dimensional/derived_units/molar_volume.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct molar_volume_repr{}; -using molar_volume_t = make_synonym_t / mol<>)>; +template struct molar_volume_synonym{}; +using molar_volume_t = make_synonym_t / mol<>)>; inline constexpr molar_volume_t molar_volume{}; using molar_volume_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/molarity.hpp b/include/dimensional/derived_units/molarity.hpp index a9b3a40d..2784b73d 100644 --- a/include/dimensional/derived_units/molarity.hpp +++ b/include/dimensional/derived_units/molarity.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct molarity_repr{}; -using molarity_t = make_synonym_t / meter<3>)>; +template struct molarity_synonym{}; +using molarity_t = make_synonym_t / meter<3>)>; inline constexpr molarity_t molarity{}; using molarity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/moment_of_inertia.hpp b/include/dimensional/derived_units/moment_of_inertia.hpp index b5d0d5c6..daacf005 100644 --- a/include/dimensional/derived_units/moment_of_inertia.hpp +++ b/include/dimensional/derived_units/moment_of_inertia.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct moment_of_inertia_repr{}; -using moment_of_inertia_t = make_synonym_t * meter<2>)>; +template struct moment_of_inertia_synonym{}; +using moment_of_inertia_t = make_synonym_t * meter<2>)>; inline constexpr moment_of_inertia_t moment_of_inertia{}; using moment_of_inertia_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/momentum.hpp b/include/dimensional/derived_units/momentum.hpp index 8a89c135..8eb73ade 100644 --- a/include/dimensional/derived_units/momentum.hpp +++ b/include/dimensional/derived_units/momentum.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct momentum_repr{}; -using momentum_t = make_synonym_t * kilogram<> * second<-1>)>; +template struct momentum_synonym{}; +using momentum_t = make_synonym_t * kilogram<> * second<-1>)>; inline constexpr momentum_t momentum{}; using momentum_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/permeability.hpp b/include/dimensional/derived_units/permeability.hpp index d1b44773..0d337a62 100644 --- a/include/dimensional/derived_units/permeability.hpp +++ b/include/dimensional/derived_units/permeability.hpp @@ -7,8 +7,8 @@ #include "inductance.hpp" namespace mitama::si { -template struct permeability_repr{}; -using permeability_t = make_synonym_t)>; +template struct permeability_synonym{}; +using permeability_t = make_synonym_t)>; inline constexpr permeability_t permeability{}; using permeability_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/permittivity.hpp b/include/dimensional/derived_units/permittivity.hpp index e57ade15..fe7b80e7 100644 --- a/include/dimensional/derived_units/permittivity.hpp +++ b/include/dimensional/derived_units/permittivity.hpp @@ -7,8 +7,8 @@ #include "capacitance.hpp" namespace mitama::si { -template struct permittivity_repr{}; -using permittivity_t = make_synonym_t)>; +template struct permittivity_synonym{}; +using permittivity_t = make_synonym_t)>; inline constexpr permittivity_t permittivity{}; using permittivity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/polarization_density.hpp b/include/dimensional/derived_units/polarization_density.hpp index bc3a26b5..45147feb 100644 --- a/include/dimensional/derived_units/polarization_density.hpp +++ b/include/dimensional/derived_units/polarization_density.hpp @@ -7,8 +7,8 @@ #include "electric_charge.hpp" namespace mitama::si { -template struct polarization_density_repr{}; -using polarization_density_t = make_synonym_t)>; +template struct polarization_density_synonym{}; +using polarization_density_t = make_synonym_t)>; inline constexpr polarization_density_t polarization_density{}; using polarization_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/pop.hpp b/include/dimensional/derived_units/pop.hpp index a5836a58..cb002f6c 100644 --- a/include/dimensional/derived_units/pop.hpp +++ b/include/dimensional/derived_units/pop.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct pop_repr{}; -using pop_t = make_synonym_t)>; +template struct pop_synonym{}; +using pop_t = make_synonym_t)>; inline constexpr pop_t pop{}; using pop_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/power.hpp b/include/dimensional/derived_units/power.hpp index 12643872..350cfe06 100644 --- a/include/dimensional/derived_units/power.hpp +++ b/include/dimensional/derived_units/power.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct power_repr{}; -using power_t = make_synonym_t * meter<2> * second<-3>)>; +template struct power_synonym{}; +using power_t = make_synonym_t * meter<2> * second<-3>)>; inline constexpr power_t watt{}; using power_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/power_density.hpp b/include/dimensional/derived_units/power_density.hpp index 6a4a2d09..a7b0d2cf 100644 --- a/include/dimensional/derived_units/power_density.hpp +++ b/include/dimensional/derived_units/power_density.hpp @@ -7,8 +7,8 @@ #include "power.hpp" namespace mitama::si { -template struct power_density_repr{}; -using power_density_t = make_synonym_t)>; +template struct power_density_synonym{}; +using power_density_t = make_synonym_t)>; inline constexpr power_density_t power_density{}; using power_density_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/pressure.hpp b/include/dimensional/derived_units/pressure.hpp index 53fa644e..bdf8f395 100644 --- a/include/dimensional/derived_units/pressure.hpp +++ b/include/dimensional/derived_units/pressure.hpp @@ -6,8 +6,8 @@ #include "../refinement.hpp" namespace mitama::si { -template struct pressure_repr{}; -using pressure_t = make_synonym_t * meter<-1> * second<-2>)>; +template struct pressure_synonym{}; +using pressure_t = make_synonym_t * meter<-1> * second<-2>)>; inline constexpr pressure_t pascal{}; using pressure_r = make_refinement_symbol_t; } diff --git a/include/dimensional/derived_units/radiance.hpp b/include/dimensional/derived_units/radiance.hpp index 54411970..6f4e9034 100644 --- a/include/dimensional/derived_units/radiance.hpp +++ b/include/dimensional/derived_units/radiance.hpp @@ -8,8 +8,8 @@ #include "solid_angle.hpp" namespace mitama::si { -template struct radiance_repr{}; -using radiance_t = make_synonym_t )>; +template struct radiance_synonym{}; +using radiance_t = make_synonym_t )>; inline constexpr radiance_t radiance{}; using radiance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/radiant_exposure.hpp b/include/dimensional/derived_units/radiant_exposure.hpp index 085b9335..458c63ba 100644 --- a/include/dimensional/derived_units/radiant_exposure.hpp +++ b/include/dimensional/derived_units/radiant_exposure.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct radiant_exposure_repr{}; -using radiant_exposure_t = make_synonym_t)>; +template struct radiant_exposure_synonym{}; +using radiant_exposure_t = make_synonym_t)>; inline constexpr radiant_exposure_t radiant_exposure{}; using radiant_exposure_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/radiant_flux.hpp b/include/dimensional/derived_units/radiant_flux.hpp index 035914e3..4a52a258 100644 --- a/include/dimensional/derived_units/radiant_flux.hpp +++ b/include/dimensional/derived_units/radiant_flux.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct radiant_flux_repr{}; -using radiant_flux_t = make_synonym_t * meter<2> * second<-3>)>; +template struct radiant_flux_synonym{}; +using radiant_flux_t = make_synonym_t * meter<2> * second<-3>)>; #ifndef MITAMA_DIMENSIONAL_DERIVED_UNITS_POWER_HPP inline constexpr radiant_flux_t watt{}; diff --git a/include/dimensional/derived_units/radiant_intensity.hpp b/include/dimensional/derived_units/radiant_intensity.hpp index b9e7f26c..de730875 100644 --- a/include/dimensional/derived_units/radiant_intensity.hpp +++ b/include/dimensional/derived_units/radiant_intensity.hpp @@ -8,8 +8,8 @@ #include "solid_angle.hpp" namespace mitama::si { -template struct radiant_intensity_repr{}; -using radiant_intensity_t = make_synonym_t; +template struct radiant_intensity_synonym{}; +using radiant_intensity_t = make_synonym_t; inline constexpr radiant_intensity_t radiant_intensity{}; using radiant_intensity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/reactance.hpp b/include/dimensional/derived_units/reactance.hpp index f0cc1755..e5eade2b 100644 --- a/include/dimensional/derived_units/reactance.hpp +++ b/include/dimensional/derived_units/reactance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct reactance_repr{}; -using reactance_t = make_synonym_t * meter<2> * second<-3> * ampere<-2>)>; +template struct reactance_synonym{}; +using reactance_t = make_synonym_t * meter<2> * second<-3> * ampere<-2>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_RESISTANCE_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_IMPEDANCE_HPP) inline constexpr reactance_t ohm{}; diff --git a/include/dimensional/derived_units/resistance.hpp b/include/dimensional/derived_units/resistance.hpp index 09aa5574..4da33fae 100644 --- a/include/dimensional/derived_units/resistance.hpp +++ b/include/dimensional/derived_units/resistance.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct resistance_repr{}; -using resistance_t = make_synonym_t * meter<2> * second<-3> * ampere<-2>)>; +template struct resistance_synonym{}; +using resistance_t = make_synonym_t * meter<2> * second<-3> * ampere<-2>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_REACTANCE_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_REACTANCE_HPP) inline constexpr resistance_t ohm{}; diff --git a/include/dimensional/derived_units/resistivity.hpp b/include/dimensional/derived_units/resistivity.hpp index 81fee4e6..79a5b6d0 100644 --- a/include/dimensional/derived_units/resistivity.hpp +++ b/include/dimensional/derived_units/resistivity.hpp @@ -7,8 +7,8 @@ #include "resistance.hpp" namespace mitama::si { -template struct resistivity_repr{}; -using resistivity_t = make_synonym_t)>; +template struct resistivity_synonym{}; +using resistivity_t = make_synonym_t)>; inline constexpr resistivity_t resistivity{}; using resistivity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/snap.hpp b/include/dimensional/derived_units/snap.hpp index 199fdb9b..f3f9c951 100644 --- a/include/dimensional/derived_units/snap.hpp +++ b/include/dimensional/derived_units/snap.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct snap_repr{}; -using snap_t = make_synonym_t)>; +template struct snap_synonym{}; +using snap_t = make_synonym_t)>; inline constexpr snap_t snap{}; using snap_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/specific_angular_momentum.hpp b/include/dimensional/derived_units/specific_angular_momentum.hpp index e958b3ac..776199a6 100644 --- a/include/dimensional/derived_units/specific_angular_momentum.hpp +++ b/include/dimensional/derived_units/specific_angular_momentum.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct specific_angular_momentum_repr{}; -using specific_angular_momentum_t = make_synonym_t * second<-1>)>; +template struct specific_angular_momentum_synonym{}; +using specific_angular_momentum_t = make_synonym_t * second<-1>)>; inline constexpr specific_angular_momentum_t specific_angular_momentum{}; using specific_angular_momentum_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/specific_energy.hpp b/include/dimensional/derived_units/specific_energy.hpp index c7091f59..00f0bc24 100644 --- a/include/dimensional/derived_units/specific_energy.hpp +++ b/include/dimensional/derived_units/specific_energy.hpp @@ -7,8 +7,8 @@ #include "energy.hpp" namespace mitama::si { -template struct specific_energy_repr{}; -using specific_energy_t = make_synonym_t)>; +template struct specific_energy_synonym{}; +using specific_energy_t = make_synonym_t)>; inline constexpr specific_energy_t specific_energy{}; using specific_energy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/specific_entropy.hpp b/include/dimensional/derived_units/specific_entropy.hpp index e570b0af..c582bf48 100644 --- a/include/dimensional/derived_units/specific_entropy.hpp +++ b/include/dimensional/derived_units/specific_entropy.hpp @@ -8,8 +8,8 @@ namespace mitama::si { -template struct specific_entropy_repr{}; -using specific_entropy_t = make_synonym_t; +template struct specific_entropy_synonym{}; +using specific_entropy_t = make_synonym_t; inline constexpr specific_entropy_t specific_entropy{}; using specific_entropy_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/specific_heat_capacity.hpp b/include/dimensional/derived_units/specific_heat_capacity.hpp index 9347bdea..4873cec9 100644 --- a/include/dimensional/derived_units/specific_heat_capacity.hpp +++ b/include/dimensional/derived_units/specific_heat_capacity.hpp @@ -8,8 +8,8 @@ namespace mitama::si { -template struct specific_heat_capacity_repr{}; -using specific_heat_capacity_t = make_synonym_t * kelvin<-1> )>; +template struct specific_heat_capacity_synonym{}; +using specific_heat_capacity_t = make_synonym_t * kelvin<-1> )>; inline constexpr specific_heat_capacity_t specific_heat_capacity{}; using specific_heat_capacity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/specific_volume.hpp b/include/dimensional/derived_units/specific_volume.hpp index fd3acc72..7568516c 100644 --- a/include/dimensional/derived_units/specific_volume.hpp +++ b/include/dimensional/derived_units/specific_volume.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct specific_volume_repr{}; -using specific_volume_t = make_synonym_t / kilogram<>)>; +template struct specific_volume_synonym{}; +using specific_volume_t = make_synonym_t / kilogram<>)>; inline constexpr specific_volume_t specific_volume{}; using specific_volume_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/spectral_intensity.hpp b/include/dimensional/derived_units/spectral_intensity.hpp index 8a41405d..144e8b58 100644 --- a/include/dimensional/derived_units/spectral_intensity.hpp +++ b/include/dimensional/derived_units/spectral_intensity.hpp @@ -8,8 +8,8 @@ #include "solid_angle.hpp" namespace mitama::si { -template struct spectral_intensity_repr{}; -using spectral_intensity_t = make_synonym_t )>; +template struct spectral_intensity_synonym{}; +using spectral_intensity_t = make_synonym_t )>; inline constexpr spectral_intensity_t spectral_intensity{}; using spectral_intensity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/spectral_irradiance.hpp b/include/dimensional/derived_units/spectral_irradiance.hpp index de5aabd2..b9c91133 100644 --- a/include/dimensional/derived_units/spectral_irradiance.hpp +++ b/include/dimensional/derived_units/spectral_irradiance.hpp @@ -7,8 +7,8 @@ #include "power.hpp" namespace mitama::si { -template struct spectral_irradiance_repr{}; -using spectral_irradiance_t = make_synonym_t)>; +template struct spectral_irradiance_synonym{}; +using spectral_irradiance_t = make_synonym_t)>; inline constexpr spectral_irradiance_t spectral_irradiance{}; using spectral_irradiance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/spectral_power.hpp b/include/dimensional/derived_units/spectral_power.hpp index 40718a99..b148291e 100644 --- a/include/dimensional/derived_units/spectral_power.hpp +++ b/include/dimensional/derived_units/spectral_power.hpp @@ -7,8 +7,8 @@ #include "power.hpp" namespace mitama::si { -template struct spectral_power_repr{}; -using spectral_power_t = make_synonym_t)>; +template struct spectral_power_synonym{}; +using spectral_power_t = make_synonym_t)>; inline constexpr spectral_power_t spectral_power{}; using spectral_power_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/spectral_radiance.hpp b/include/dimensional/derived_units/spectral_radiance.hpp index 8217294a..19db3726 100644 --- a/include/dimensional/derived_units/spectral_radiance.hpp +++ b/include/dimensional/derived_units/spectral_radiance.hpp @@ -8,8 +8,8 @@ #include "solid_angle.hpp" namespace mitama::si { -template struct spectral_radiance_repr{}; -using spectral_radiance_t = make_synonym_t) )>; +template struct spectral_radiance_synonym{}; +using spectral_radiance_t = make_synonym_t) )>; inline constexpr spectral_radiance_t spectral_radiance{}; using spectral_radiance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/stiffness.hpp b/include/dimensional/derived_units/stiffness.hpp index 399c8b95..33e57ef3 100644 --- a/include/dimensional/derived_units/stiffness.hpp +++ b/include/dimensional/derived_units/stiffness.hpp @@ -7,8 +7,8 @@ #include "./force.hpp" namespace mitama::si { -template struct stiffness_repr{}; -using stiffness_t = make_synonym_t)>; +template struct stiffness_synonym{}; +using stiffness_t = make_synonym_t)>; inline constexpr stiffness_t stiffness{}; using stiffness_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/surface_tension.hpp b/include/dimensional/derived_units/surface_tension.hpp index 636cf558..319d1d62 100644 --- a/include/dimensional/derived_units/surface_tension.hpp +++ b/include/dimensional/derived_units/surface_tension.hpp @@ -7,8 +7,8 @@ #include "force.hpp" namespace mitama::si { -template struct surface_tension_repr{}; -using surface_tension_t = make_synonym_t)>; +template struct surface_tension_synonym{}; +using surface_tension_t = make_synonym_t)>; inline constexpr surface_tension_t surface_tension{}; using surface_tension_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/temperature_gradient.hpp b/include/dimensional/derived_units/temperature_gradient.hpp index 388eb41f..e17af4f6 100644 --- a/include/dimensional/derived_units/temperature_gradient.hpp +++ b/include/dimensional/derived_units/temperature_gradient.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct temperature_gradient_repr{}; -using temperature_gradient_t = make_synonym_t / meter<>)>; +template struct temperature_gradient_synonym{}; +using temperature_gradient_t = make_synonym_t / meter<>)>; inline constexpr temperature_gradient_t temperature_gradient{}; using temperature_gradient_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/thermal_conductivity.hpp b/include/dimensional/derived_units/thermal_conductivity.hpp index 3af8ac1f..0b0271c5 100644 --- a/include/dimensional/derived_units/thermal_conductivity.hpp +++ b/include/dimensional/derived_units/thermal_conductivity.hpp @@ -8,8 +8,8 @@ namespace mitama::si { -template struct thermal_conductivity_repr{}; -using thermal_conductivity_t = make_synonym_t * kelvin<-1> )>; +template struct thermal_conductivity_synonym{}; +using thermal_conductivity_t = make_synonym_t * kelvin<-1> )>; inline constexpr thermal_conductivity_t thermal_conductivity{}; using thermal_conductivity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/thermal_diffusivity.hpp b/include/dimensional/derived_units/thermal_diffusivity.hpp index e9583fe7..23f7e3a5 100644 --- a/include/dimensional/derived_units/thermal_diffusivity.hpp +++ b/include/dimensional/derived_units/thermal_diffusivity.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct thermal_diffusivity_repr{}; -using thermal_diffusivity_t = make_synonym_t / second<1>)>; +template struct thermal_diffusivity_synonym{}; +using thermal_diffusivity_t = make_synonym_t / second<1>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_KINEMATIC_VISCOSITY_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_DIFFUSION_COEFFICIENT_HPP) inline constexpr thermal_diffusivity_t thermal_diffusivity{}; diff --git a/include/dimensional/derived_units/thermal_resistance.hpp b/include/dimensional/derived_units/thermal_resistance.hpp index 0ef3065b..5351ef92 100644 --- a/include/dimensional/derived_units/thermal_resistance.hpp +++ b/include/dimensional/derived_units/thermal_resistance.hpp @@ -8,8 +8,8 @@ namespace mitama::si { -template struct thermal_resistance_repr{}; -using thermal_resistance_t = make_synonym_t / watt)>; +template struct thermal_resistance_synonym{}; +using thermal_resistance_t = make_synonym_t / watt)>; inline constexpr thermal_resistance_t thermal_resistance{}; using thermal_resistance_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/torque.hpp b/include/dimensional/derived_units/torque.hpp index 0c3fd227..41c7b791 100644 --- a/include/dimensional/derived_units/torque.hpp +++ b/include/dimensional/derived_units/torque.hpp @@ -7,8 +7,8 @@ #include "force.hpp" namespace mitama::si { -template struct torque_repr{}; -using torque_t = make_synonym_t; +template struct torque_synonym{}; +using torque_t = make_synonym_t; inline constexpr torque_t torque{}; using torque_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/velocity.hpp b/include/dimensional/derived_units/velocity.hpp index 8fbabd70..9ef0d674 100644 --- a/include/dimensional/derived_units/velocity.hpp +++ b/include/dimensional/derived_units/velocity.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct velocity_repr{}; -using velocity_t = make_synonym_t; +template struct velocity_synonym{}; +using velocity_t = make_synonym_t; inline constexpr velocity_t velocity{}; using velocity_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/voltage.hpp b/include/dimensional/derived_units/voltage.hpp index 1c089b9f..44fe02b3 100644 --- a/include/dimensional/derived_units/voltage.hpp +++ b/include/dimensional/derived_units/voltage.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct voltage_repr{}; -using voltage_t = make_synonym_t * meter<2> * second<-3> * ampere<-1>)>; +template struct voltage_synonym{}; +using voltage_t = make_synonym_t * meter<2> * second<-3> * ampere<-1>)>; #ifndef MITAMA_DIMENSIONAL_DERIVED_UNITS_ELECTRIC_POTENTIAL_HPP inline constexpr voltage_t volts{}; diff --git a/include/dimensional/derived_units/volumetric_flow.hpp b/include/dimensional/derived_units/volumetric_flow.hpp index 2e2fc5ae..64659c0b 100644 --- a/include/dimensional/derived_units/volumetric_flow.hpp +++ b/include/dimensional/derived_units/volumetric_flow.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct volumetric_flow_repr{}; -using volumetric_flow_t = make_synonym_t / second<>)>; +template struct volumetric_flow_synonym{}; +using volumetric_flow_t = make_synonym_t / second<>)>; inline constexpr volumetric_flow_t volumetric_flow{}; using volumetric_flow_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/weight.hpp b/include/dimensional/derived_units/weight.hpp index e4fe113f..95ef4949 100644 --- a/include/dimensional/derived_units/weight.hpp +++ b/include/dimensional/derived_units/weight.hpp @@ -6,8 +6,8 @@ #include "../refinement.hpp" namespace mitama::si { -template struct weight_repr{}; -using weight_t = make_synonym_t * meter<> * second<-2>)>; +template struct weight_synonym{}; +using weight_t = make_synonym_t * meter<> * second<-2>)>; #ifndef MITAMA_DIMENSIONAL_DERIVED_UNITS_FORCE_HPP inline constexpr weight_t newton{}; using weight_r = make_refinement_symbol_t; diff --git a/include/dimensional/derived_units/work.hpp b/include/dimensional/derived_units/work.hpp index 59c8affa..86574c9b 100644 --- a/include/dimensional/derived_units/work.hpp +++ b/include/dimensional/derived_units/work.hpp @@ -7,8 +7,8 @@ namespace mitama::si { -template struct work_repr{}; -using work_t = make_synonym_t * meter<2> * second<-2>)>; +template struct work_synonym{}; +using work_t = make_synonym_t * meter<2> * second<-2>)>; #if !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_ENERGY_HPP) && !defined(MITAMA_DIMENSIONAL_DERIVED_UNITS_HEAT_HPP) inline constexpr work_t joule{}; diff --git a/include/dimensional/dimensional_phantom.hpp b/include/dimensional/dimensional_phantom.hpp index fe6a0980..fb77b5e4 100644 --- a/include/dimensional/dimensional_phantom.hpp +++ b/include/dimensional/dimensional_phantom.hpp @@ -17,7 +17,7 @@ inline constexpr std::size_t dimension_count_v = namespace mitama { template < class > -struct si_base_units_repr {}; +struct si_base_units {}; template struct dimension_tag {}; @@ -31,7 +31,7 @@ struct dimensional_t : private Units::tag... // for Dimensional tags }; template -using make_dimensional_t = si_base_units_repr>; +using make_dimensional_t = si_base_units>; } // namespace mitama diff --git a/include/dimensional/dimensional_traits.hpp b/include/dimensional/dimensional_traits.hpp index ad9ceb55..573241dc 100644 --- a/include/dimensional/dimensional_traits.hpp +++ b/include/dimensional/dimensional_traits.hpp @@ -20,8 +20,8 @@ namespace mitama { // dimensional_t traits template struct is_dimensional : std::false_type {}; - template