From 37cfc53d1d277168cb9dfc5a0f0e827d6c531c11 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 30 Mar 2021 13:21:05 +0200 Subject: [PATCH] refactor: IWYU applied to the source files `alternative_namespaces` examples left out as I consider them a subject for removal in the nearest future. --- example/avg_speed.cpp | 9 ++- example/box_example.cpp | 32 +++++++++- example/capacitor_time_curve.cpp | 4 +- example/clcpp_response.cpp | 25 ++++---- example/conversion_factor.cpp | 4 +- example/custom_systems.cpp | 6 +- example/experimental_angle.cpp | 19 +++--- example/foot_pound_second.cpp | 4 +- example/geographic.cpp | 1 + example/geographic.h | 7 ++- example/glide_computer.cpp | 4 ++ example/glide_computer.h | 59 +++++++++++-------- example/glide_computer_example.cpp | 13 +++- example/hello_units.cpp | 7 ++- ...lman_filter-alpha_beta_filter_example2.cpp | 26 +++++++- example/linear_algebra.cpp | 5 +- example/measurement.cpp | 5 +- example/total_energy.cpp | 6 +- example/unknown_dimension.cpp | 5 +- src/core-fmt/include/units/format.h | 4 ++ src/core-io/include/units/quantity_io.h | 5 +- src/core/include/units/base_dimension.h | 3 + src/core/include/units/bits/basic_concepts.h | 7 ++- src/core/include/units/bits/dimension_op.h | 5 ++ .../units/bits/external/fixed_string.h | 5 +- .../include/units/bits/external/type_list.h | 2 + src/core/include/units/chrono.h | 2 + src/core/include/units/concepts.h | 2 + src/core/include/units/derived_dimension.h | 3 + src/core/include/units/generic/angle.h | 9 ++- .../include/units/generic/dimensionless.h | 4 ++ src/core/include/units/math.h | 10 +++- src/core/include/units/prefix.h | 2 + src/core/include/units/quantity.h | 10 +++- src/core/include/units/quantity_kind.h | 3 + src/core/include/units/quantity_point.h | 5 ++ src/core/include/units/quantity_point_kind.h | 2 + src/core/include/units/random.h | 2 +- src/core/include/units/ratio.h | 9 +-- src/core/include/units/symbol_text.h | 8 ++- src/core/include/units/unit.h | 10 ++-- .../include/units/isq/iec80000/iec80000.h | 2 + .../units/isq/iec80000/modulation_rate.h | 7 +++ .../units/isq/iec80000/storage_capacity.h | 7 ++- .../units/isq/iec80000/traffic_intensity.h | 6 +- .../units/isq/iec80000/transfer_rate.h | 5 ++ .../include/units/isq/natural/constants.h | 2 +- .../units/isq/natural/{bits => }/dimensions.h | 4 +- .../include/units/isq/natural/natural.h | 9 ++- .../units/isq/natural/{bits => }/units.h | 6 +- .../isq/include/units/isq/dimensions.h | 2 + .../include/units/isq/si/cgs/acceleration.h | 8 ++- .../si-cgs/include/units/isq/si/cgs/area.h | 9 ++- .../si-cgs/include/units/isq/si/cgs/cgs.h | 2 + .../si-cgs/include/units/isq/si/cgs/energy.h | 8 ++- .../si-cgs/include/units/isq/si/cgs/force.h | 8 ++- .../si-cgs/include/units/isq/si/cgs/length.h | 7 +++ .../si-cgs/include/units/isq/si/cgs/mass.h | 9 ++- .../si-cgs/include/units/isq/si/cgs/power.h | 7 ++- .../include/units/isq/si/cgs/pressure.h | 8 ++- .../si-cgs/include/units/isq/si/cgs/speed.h | 7 ++- .../si-cgs/include/units/isq/si/cgs/time.h | 5 ++ .../include/units/isq/si/fps/acceleration.h | 7 ++- .../si-fps/include/units/isq/si/fps/area.h | 8 ++- .../si-fps/include/units/isq/si/fps/density.h | 7 ++- .../si-fps/include/units/isq/si/fps/energy.h | 17 ++---- .../si-fps/include/units/isq/si/fps/force.h | 8 ++- .../si-fps/include/units/isq/si/fps/fps.h | 2 + .../si-fps/include/units/isq/si/fps/length.h | 11 +++- .../si-fps/include/units/isq/si/fps/mass.h | 9 ++- .../si-fps/include/units/isq/si/fps/power.h | 8 ++- .../include/units/isq/si/fps/pressure.h | 8 ++- .../si-fps/include/units/isq/si/fps/speed.h | 8 ++- .../si-fps/include/units/isq/si/fps/time.h | 9 ++- .../si-fps/include/units/isq/si/fps/volume.h | 8 ++- .../si-iau/include/units/isq/si/iau/iau.h | 2 + .../si-iau/include/units/isq/si/iau/length.h | 8 +++ .../include/units/isq/si/imperial/imperial.h | 2 + .../include/units/isq/si/imperial/length.h | 8 +++ .../include/units/isq/si/international/area.h | 8 +++ .../isq/si/international/international.h | 2 + .../units/isq/si/international/length.h | 8 +++ .../units/isq/si/international/speed.h | 9 ++- .../units/isq/si/international/volume.h | 10 +++- .../include/units/isq/si/typographic/length.h | 8 +++ .../units/isq/si/typographic/typographic.h | 2 + .../si-us/include/units/isq/si/us/length.h | 8 +++ .../si-us/include/units/isq/si/us/us.h | 2 + .../si/include/units/isq/si/absorbed_dose.h | 8 ++- .../si/include/units/isq/si/acceleration.h | 7 ++- .../units/isq/si/amount_of_substance.h | 9 ++- .../include/units/isq/si/angular_velocity.h | 8 ++- src/systems/si/include/units/isq/si/area.h | 8 ++- .../si/include/units/isq/si/capacitance.h | 8 ++- .../include/units/isq/si/catalytic_activity.h | 8 ++- .../si/include/units/isq/si/charge_density.h | 7 ++- .../si/include/units/isq/si/concentration.h | 7 ++- .../si/include/units/isq/si/conductance.h | 8 ++- .../si/include/units/isq/si/current_density.h | 7 ++- src/systems/si/include/units/isq/si/density.h | 7 ++- .../include/units/isq/si/dynamic_viscosity.h | 13 ++-- .../si/include/units/isq/si/electric_charge.h | 8 ++- .../include/units/isq/si/electric_current.h | 9 ++- .../units/isq/si/electric_field_strength.h | 7 ++- src/systems/si/include/units/isq/si/energy.h | 8 ++- .../si/include/units/isq/si/energy_density.h | 7 ++- src/systems/si/include/units/isq/si/force.h | 8 ++- .../si/include/units/isq/si/frequency.h | 8 ++- .../si/include/units/isq/si/heat_capacity.h | 7 ++- .../si/include/units/isq/si/inductance.h | 8 ++- src/systems/si/include/units/isq/si/length.h | 9 ++- .../si/include/units/isq/si/luminance.h | 7 ++- .../include/units/isq/si/luminous_intensity.h | 9 ++- .../si/include/units/isq/si/magnetic_flux.h | 8 ++- .../include/units/isq/si/magnetic_induction.h | 8 ++- src/systems/si/include/units/isq/si/mass.h | 9 ++- .../si/include/units/isq/si/molar_energy.h | 7 ++- .../si/include/units/isq/si/momentum.h | 7 ++- .../si/include/units/isq/si/permeability.h | 7 ++- .../si/include/units/isq/si/permittivity.h | 7 ++- src/systems/si/include/units/isq/si/power.h | 8 ++- .../si/include/units/isq/si/pressure.h | 8 ++- .../si/include/units/isq/si/radioactivity.h | 8 ++- .../si/include/units/isq/si/resistance.h | 8 ++- src/systems/si/include/units/isq/si/si.h | 2 + src/systems/si/include/units/isq/si/speed.h | 7 ++- .../si/include/units/isq/si/surface_tension.h | 7 ++- .../units/isq/si/thermal_conductivity.h | 7 ++- .../units/isq/si/thermodynamic_temperature.h | 7 ++- src/systems/si/include/units/isq/si/time.h | 7 ++- src/systems/si/include/units/isq/si/torque.h | 13 ++-- src/systems/si/include/units/isq/si/voltage.h | 8 ++- src/systems/si/include/units/isq/si/volume.h | 8 ++- test/unit_test/runtime/distribution_test.cpp | 6 +- test/unit_test/runtime/fmt_test.cpp | 9 ++- test/unit_test/runtime/fmt_units_test.cpp | 20 +++---- test/unit_test/runtime/math_test.cpp | 8 ++- test/unit_test/static/cgs_test.cpp | 12 +--- test/unit_test/static/chrono_test.cpp | 4 +- test/unit_test/static/concepts_test.cpp | 16 +++-- .../static/custom_rep_test_min_expl.cpp | 5 +- .../static/custom_rep_test_min_impl.cpp | 6 +- test/unit_test/static/custom_unit_test.cpp | 11 ++-- test/unit_test/static/dimension_op_test.cpp | 11 ++-- test/unit_test/static/fixed_string_test.cpp | 2 +- test/unit_test/static/fps_test.cpp | 9 +-- test/unit_test/static/iec80000_test.cpp | 1 + test/unit_test/static/kind_test.cpp | 15 +++-- test/unit_test/static/math_test.cpp | 12 ++-- test/unit_test/static/quantity_kind_test.cpp | 22 ++++--- .../static/quantity_point_kind_test.cpp | 19 +++--- test/unit_test/static/quantity_point_test.cpp | 17 +++--- test/unit_test/static/quantity_test.cpp | 27 +++++---- test/unit_test/static/ratio_test.cpp | 2 +- test/unit_test/static/references_test.cpp | 17 ++---- test/unit_test/static/si_cgs_test.cpp | 17 ++---- test/unit_test/static/si_fps_test.cpp | 11 +--- test/unit_test/static/si_test.cpp | 4 +- test/unit_test/static/symbol_text_test.cpp | 2 +- test/unit_test/static/test_tools.h | 2 +- test/unit_test/static/type_list_test.cpp | 8 +-- test/unit_test/static/unit_test.cpp | 9 ++- test/unit_test/static/us_test.cpp | 6 +- 163 files changed, 977 insertions(+), 352 deletions(-) rename src/systems/isq-natural/include/units/isq/natural/{bits => }/dimensions.h (96%) rename src/systems/isq-natural/include/units/isq/natural/{bits => }/units.h (95%) diff --git a/example/avg_speed.cpp b/example/avg_speed.cpp index 2340e5f1..e00d90d7 100644 --- a/example/avg_speed.cpp +++ b/example/avg_speed.cpp @@ -20,10 +20,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include // IWYU pragma: keep +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include #include #include +#include #include namespace { diff --git a/example/box_example.cpp b/example/box_example.cpp index 9ac3b645..0e7afbaf 100644 --- a/example/box_example.cpp +++ b/example/box_example.cpp @@ -1,14 +1,40 @@ -#include +// The MIT License (MIT) +// +// Copyright (c) 2018 Mateusz Pusz +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#include +#include +#include #include -#include +#include #include #include +#include #include +#include // IWYU pragma: keep #include #include -#include #include #include +#include namespace { diff --git a/example/capacitor_time_curve.cpp b/example/capacitor_time_curve.cpp index af75e6d2..e1300e91 100644 --- a/example/capacitor_time_curve.cpp +++ b/example/capacitor_time_curve.cpp @@ -20,11 +20,13 @@ physical_quantities */ +#include +#include #include #include #include #include -#include +#include // IWYU pragma: keep #include #include diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp index a098d920..6a130b2f 100644 --- a/example/clcpp_response.cpp +++ b/example/clcpp_response.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -112,29 +111,29 @@ void calcs_comparison() "when adding two values of the same very big\n" "or very small type:\n\n"; - length L1A = 2._q_fm; - length L2A = 3._q_fm; - length LrA = L1A + L2A; - fmt::print("{:%.30Q %q}\n + {:%.30Q %q}\n = {:%.30Q %q}\n\n",L1A,L2A,LrA); + length L1A = 2._q_fm; + length L2A = 3._q_fm; + length LrA = L1A + L2A; + fmt::print("{:%.30Q %q}\n + {:%.30Q %q}\n = {:%.30Q %q}\n\n", L1A, L2A, LrA); std::cout << "The single unit method must convert large\n" "or small values in other units to the base unit.\n" "This is both inefficient and inaccurate\n\n"; - length L1B = L1A; - length L2B = L2A; - length LrB = L1B + L2B; - fmt::print("{:%.30Q %q}\n + {:%.30Q %q}\n = {:%.30Q %q}\n\n",L1B,L2B,LrB); + length L1B = L1A; + length L2B = L2A; + length LrB = L1B + L2B; + fmt::print("{:%.30Q %q}\n + {:%.30Q %q}\n = {:%.30Q %q}\n\n", L1B, L2B, LrB); std::cout << "In multiplication and division:\n\n"; - area ArA = L1A * L2A; - fmt::print("{:%.30Q %q}\n * {:%.30Q %q}\n = {:%.30Q %q}\n\n",L1A,L2A,ArA); + area ArA = L1A * L2A; + fmt::print("{:%.30Q %q}\n * {:%.30Q %q}\n = {:%.30Q %q}\n\n", L1A, L2A, ArA); std::cout << "similar problems arise\n\n"; - area ArB = L1B * L2B; - fmt::print("{:%.30Q %q}\n * {:%.30Q %q}\n = {:%.30Q %q}\n\n",L1B,L2B,ArB); + area ArB = L1B * L2B; + fmt::print("{:%.30Q %q}\n * {:%.30Q %q}\n = {:%.30Q %q}\n\n", L1B, L2B, ArB); } } // namespace diff --git a/example/conversion_factor.cpp b/example/conversion_factor.cpp index 2e70c1bf..7e370522 100644 --- a/example/conversion_factor.cpp +++ b/example/conversion_factor.cpp @@ -15,10 +15,10 @@ along with this program. If not, see http://www.gnu.org/licenses./ */ -#include #include -#include +#include #include +#include /* get conversion factor from one dimensionally equivalent diff --git a/example/custom_systems.cpp b/example/custom_systems.cpp index 10063b09..f8fa8a3b 100644 --- a/example/custom_systems.cpp +++ b/example/custom_systems.cpp @@ -20,9 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include +#include +#include +#include #include +#include using namespace units; diff --git a/example/experimental_angle.cpp b/example/experimental_angle.cpp index 4080bf81..5b7328d0 100644 --- a/example/experimental_angle.cpp +++ b/example/experimental_angle.cpp @@ -20,23 +20,24 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include #include -#include #include -#include +#include +#include +#include // IWYU pragma: keep #include #include -using namespace units; -using namespace units::isq::si::literals; - int main() { - auto torque = 20.0_q_Nm_per_rad; - auto energy = 20.0_q_J; + using namespace units::references; + using namespace units::isq; + using namespace units::isq::si::references; - Angle auto angle = energy / torque; + Torque auto torque = 20.0 * (N * m / rad); + Energy auto energy = 20.0 * J; + + units::Angle auto angle = energy / torque; std::cout << angle << '\n'; } diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.cpp index ea54a1ae..841068f7 100644 --- a/example/foot_pound_second.cpp +++ b/example/foot_pound_second.cpp @@ -20,21 +20,19 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include #include #include #include #include #include #include -#include #include #include #include #include #include -#include #include +#include using namespace units::isq; diff --git a/example/geographic.cpp b/example/geographic.cpp index a6bc66d1..316563d9 100644 --- a/example/geographic.cpp +++ b/example/geographic.cpp @@ -23,6 +23,7 @@ #include "geographic.h" #include #include +#include namespace { diff --git a/example/geographic.h b/example/geographic.h index 6bd33522..183ff971 100644 --- a/example/geographic.h +++ b/example/geographic.h @@ -22,10 +22,15 @@ #pragma once -#include #include #include +#include +#include +#include + +// IWYU pragma: begin_exports #include +// IWYU pragma: end_exports namespace geographic { diff --git a/example/glide_computer.cpp b/example/glide_computer.cpp index 4746c4f4..6325ca46 100644 --- a/example/glide_computer.cpp +++ b/example/glide_computer.cpp @@ -21,9 +21,13 @@ // SOFTWARE. #include "glide_computer.h" +#include +#include namespace glide_computer { +using namespace units::isq; + task::legs task::make_legs(const waypoints& wpts) { task::legs res; diff --git a/example/glide_computer.h b/example/glide_computer.h index f1b94008..40341237 100644 --- a/example/glide_computer.h +++ b/example/glide_computer.h @@ -22,12 +22,24 @@ #pragma once +// IWYU pragma: begin_exports #include "geographic.h" -#include -#include +#include #include -#include +#include #include +// IWYU pragma: end_exports + +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include // An example of a really simplified tactical glide computer // Simplifications: @@ -43,9 +55,6 @@ // - no ground obstacles (i.e. mountains) to pass // - flight path exactly on a shortest possible line to destination -using namespace units; -using namespace units::isq; - template struct fmt::formatter : formatter { template @@ -57,8 +66,8 @@ struct fmt::formatter : formatter { namespace glide_computer { -template -constexpr Dimensionless auto operator/(const QK1& lhs, const QK2& rhs) +template +constexpr units::Dimensionless auto operator/(const QK1& lhs, const QK2& rhs) requires(!units::QuantityKindRelatedTo) && requires { lhs.common() / rhs.common();} { return lhs.common() / rhs.common(); @@ -66,24 +75,24 @@ constexpr Dimensionless auto operator/(const QK1& lhs, const QK2& rhs) // kinds using horizontal_kind = geographic::horizontal_kind; -struct vertical_kind : kind {}; -struct vertical_point_kind : point_kind {}; -struct velocity_kind : derived_kind {}; -struct rate_of_climb_kind : derived_kind {}; +struct vertical_kind : units::kind {}; +struct vertical_point_kind : units::point_kind {}; +struct velocity_kind : units::derived_kind {}; +struct rate_of_climb_kind : units::derived_kind {}; // https://en.wikipedia.org/wiki/Flight_planning#Units_of_measurement // length -using distance = quantity_kind; -using height = quantity_kind; -using altitude = quantity_point_kind; +using distance = units::quantity_kind; +using height = units::quantity_kind; +using altitude = units::quantity_point_kind; // time -using duration = si::time; -using timestamp = quantity_point; +using duration = units::isq::si::time; +using timestamp = units::quantity_point; // speed -using velocity = quantity_kind; -using rate_of_climb = quantity_kind; +using velocity = units::quantity_kind; +using rate_of_climb = units::quantity_kind; // text output template @@ -117,7 +126,7 @@ struct glider { std::array polar; }; -constexpr Dimensionless auto glide_ratio(const glider::polar_point& polar) { return polar.v / -polar.climb; } +constexpr units::Dimensionless auto glide_ratio(const glider::polar_point& polar) { return polar.v / -polar.climb; } struct weather { height cloud_base; @@ -160,10 +169,10 @@ public: distance get_length() const { return length_; } - distance get_leg_dist_offset(size_t leg_index) const { return leg_index == 0 ? distance{} : leg_total_distances_[leg_index - 1]; } - size_t get_leg_index(distance dist) const + distance get_leg_dist_offset(std::size_t leg_index) const { return leg_index == 0 ? distance{} : leg_total_distances_[leg_index - 1]; } + std::size_t get_leg_index(distance dist) const { - return static_cast(std::ranges::distance(leg_total_distances_.cbegin(), std::ranges::lower_bound(leg_total_distances_, dist))); + return static_cast(std::ranges::distance(leg_total_distances_.cbegin(), std::ranges::lower_bound(leg_total_distances_, dist))); } private: @@ -188,7 +197,7 @@ struct aircraft_tow { struct flight_point { timestamp ts; altitude alt; - size_t leg_idx = 0; + std::size_t leg_idx = 0; distance dist{}; }; @@ -196,7 +205,7 @@ altitude terrain_level_alt(const task& t, const flight_point& pos); constexpr height agl(altitude glider_alt, altitude terrain_level) { return glider_alt - terrain_level; } -inline si::length length_3d(distance dist, height h) +inline units::isq::si::length length_3d(distance dist, height h) { // TODO support for hypot(q, q) return sqrt(pow<2>(dist.common()) + pow<2>(h.common())); diff --git a/example/glide_computer_example.cpp b/example/glide_computer_example.cpp index 55f3dde9..1b1455a9 100644 --- a/example/glide_computer_example.cpp +++ b/example/glide_computer_example.cpp @@ -21,14 +21,25 @@ // SOFTWARE. #include "glide_computer.h" +#include #include +#include +#include +#include #include +#include #include +#include +#include +#include +#include namespace { using namespace glide_computer; +using namespace units::isq; + auto get_gliders() { using namespace si::references; @@ -74,7 +85,7 @@ void print(const R& gliders) std::cout << "- Name: " << g.name << "\n"; std::cout << "- Polar:\n"; for (const auto& p : g.polar) - fmt::print(" * {:%.4Q %q} @ {:%.1Q %q} -> {:%.1Q %q}\n", p.climb, p.v, quantity_cast(glide_ratio(g.polar[0]))); + fmt::print(" * {:%.4Q %q} @ {:%.1Q %q} -> {:%.1Q %q}\n", p.climb, p.v, quantity_cast(glide_ratio(g.polar[0]))); std::cout << "\n"; } } diff --git a/example/hello_units.cpp b/example/hello_units.cpp index 33775b85..b7513dbd 100644 --- a/example/hello_units.cpp +++ b/example/hello_units.cpp @@ -21,8 +21,11 @@ // SOFTWARE. #include -#include -#include +#include +#include // IWYU pragma: keep +#include +#include // IWYU pragma: keep +#include #include #include diff --git a/example/kalman_filter-alpha_beta_filter_example2.cpp b/example/kalman_filter-alpha_beta_filter_example2.cpp index f970d2d9..52f53ead 100644 --- a/example/kalman_filter-alpha_beta_filter_example2.cpp +++ b/example/kalman_filter-alpha_beta_filter_example2.cpp @@ -1,5 +1,29 @@ +// The MIT License (MIT) +// +// Copyright (c) 2018 Mateusz Pusz +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + #include +#include #include +#include #include #include @@ -56,7 +80,7 @@ int main() constexpr auto num_measurements = measurements.size(); - std::array track; + std::array track; // We need an initial estimate of track[0] as there is no previous state to get a prediction from track[0].range.estimated_current_state = 30'000_q_m; track[0].speed.estimated_current_state = 40.0_q_m_per_s; diff --git a/example/linear_algebra.cpp b/example/linear_algebra.cpp index a06cf8a4..e98b69bd 100644 --- a/example/linear_algebra.cpp +++ b/example/linear_algebra.cpp @@ -20,9 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include // IWYU pragma: keep #include -#include +#include +#include // IWYU pragma: keep #include #include #include diff --git a/example/measurement.cpp b/example/measurement.cpp index 4715ba9d..62dc7dac 100644 --- a/example/measurement.cpp +++ b/example/measurement.cpp @@ -21,9 +21,12 @@ // SOFTWARE. #include +#include +#include +#include #include #include -#include +#include #include namespace { diff --git a/example/total_energy.cpp b/example/total_energy.cpp index 543b394a..7420f241 100644 --- a/example/total_energy.cpp +++ b/example/total_energy.cpp @@ -20,13 +20,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include +#include #include -#include +#include // IWYU pragma: keep #include #include #include +#include #include namespace { diff --git a/example/unknown_dimension.cpp b/example/unknown_dimension.cpp index dea18b0b..aed204d8 100644 --- a/example/unknown_dimension.cpp +++ b/example/unknown_dimension.cpp @@ -20,8 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include +#include // IWYU pragma: keep +#include #include +#include #include namespace { diff --git a/src/core-fmt/include/units/format.h b/src/core-fmt/include/units/format.h index 86f504ee..259a0456 100644 --- a/src/core-fmt/include/units/format.h +++ b/src/core-fmt/include/units/format.h @@ -31,8 +31,12 @@ #pragma warning (disable:4702) // C4702: unreachable code #endif //_MSC_VER +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports + +// #include #ifdef _MSC_VER #pragma warning (pop) diff --git a/src/core-io/include/units/quantity_io.h b/src/core-io/include/units/quantity_io.h index 4be8f3ab..78b2522b 100644 --- a/src/core-io/include/units/quantity_io.h +++ b/src/core-io/include/units/quantity_io.h @@ -23,9 +23,12 @@ #pragma once -#include #include + +// IWYU pragma: begin_exports +#include #include +// IWYU pragma: end_exports namespace units { diff --git a/src/core/include/units/base_dimension.h b/src/core/include/units/base_dimension.h index 9653ec27..41e26b6a 100644 --- a/src/core/include/units/base_dimension.h +++ b/src/core/include/units/base_dimension.h @@ -22,8 +22,11 @@ #pragma once +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports + #include namespace units { diff --git a/src/core/include/units/bits/basic_concepts.h b/src/core/include/units/bits/basic_concepts.h index e31e922e..b15f3b27 100644 --- a/src/core/include/units/bits/basic_concepts.h +++ b/src/core/include/units/bits/basic_concepts.h @@ -22,12 +22,15 @@ #pragma once -#include -#include #include + +// IWYU pragma: begin_exports +#include #include #include #include +// IWYU pragma: end_exports + #include #include diff --git a/src/core/include/units/bits/dimension_op.h b/src/core/include/units/bits/dimension_op.h index e12c7383..5b6d16fb 100644 --- a/src/core/include/units/bits/dimension_op.h +++ b/src/core/include/units/bits/dimension_op.h @@ -22,6 +22,11 @@ #pragma once +#include +#include +#include +#include +#include #include #include diff --git a/src/core/include/units/bits/external/fixed_string.h b/src/core/include/units/bits/external/fixed_string.h index 7f47254f..7b3ec35d 100644 --- a/src/core/include/units/bits/external/fixed_string.h +++ b/src/core/include/units/bits/external/fixed_string.h @@ -22,9 +22,12 @@ #pragma once -#include +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports + +#include // TODO use when moved to C++20 modules (parsing takes too long for each translation unit) diff --git a/src/core/include/units/bits/external/type_list.h b/src/core/include/units/bits/external/type_list.h index 530520b8..51dc09f5 100644 --- a/src/core/include/units/bits/external/type_list.h +++ b/src/core/include/units/bits/external/type_list.h @@ -22,7 +22,9 @@ #pragma once +#include #include +#include #ifdef _MSC_VER #pragma warning (push) diff --git a/src/core/include/units/chrono.h b/src/core/include/units/chrono.h index 3f5506de..5e5d14e9 100644 --- a/src/core/include/units/chrono.h +++ b/src/core/include/units/chrono.h @@ -23,8 +23,10 @@ #pragma once #include +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports namespace units { diff --git a/src/core/include/units/concepts.h b/src/core/include/units/concepts.h index e8fbccd1..edf5e4b0 100644 --- a/src/core/include/units/concepts.h +++ b/src/core/include/units/concepts.h @@ -22,5 +22,7 @@ #pragma once +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports diff --git a/src/core/include/units/derived_dimension.h b/src/core/include/units/derived_dimension.h index 3b432ce9..ce014c40 100644 --- a/src/core/include/units/derived_dimension.h +++ b/src/core/include/units/derived_dimension.h @@ -29,7 +29,10 @@ #include #include #include + +// IWYU pragma: begin_exports #include +// IWYU pragma: end_exports namespace units { diff --git a/src/core/include/units/generic/angle.h b/src/core/include/units/generic/angle.h index 3c8df30a..6110bc54 100644 --- a/src/core/include/units/generic/angle.h +++ b/src/core/include/units/generic/angle.h @@ -22,8 +22,13 @@ #pragma once -#include +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + +#include namespace units { @@ -46,7 +51,7 @@ constexpr auto operator"" _q_rad(long double l) { return angle, radian>{}; diff --git a/src/core/include/units/generic/dimensionless.h b/src/core/include/units/generic/dimensionless.h index a4f0175e..269e945e 100644 --- a/src/core/include/units/generic/dimensionless.h +++ b/src/core/include/units/generic/dimensionless.h @@ -22,6 +22,10 @@ #pragma once +// IWYU pragma: begin_exports +#include +// IWYU pragma: end_exports + #include namespace units { diff --git a/src/core/include/units/math.h b/src/core/include/units/math.h index a2ce3493..7aa4113c 100644 --- a/src/core/include/units/math.h +++ b/src/core/include/units/math.h @@ -22,9 +22,17 @@ #pragma once -#include +#include +#include +#include #include +#include + +// IWYU pragma: begin_exports #include +#include +// IWYU pragma: end_exports + #include namespace units { diff --git a/src/core/include/units/prefix.h b/src/core/include/units/prefix.h index 06e363fc..121d9379 100644 --- a/src/core/include/units/prefix.h +++ b/src/core/include/units/prefix.h @@ -24,8 +24,10 @@ #include #include +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports namespace units { diff --git a/src/core/include/units/quantity.h b/src/core/include/units/quantity.h index 3c321d2b..fc79893f 100644 --- a/src/core/include/units/quantity.h +++ b/src/core/include/units/quantity.h @@ -24,12 +24,16 @@ #pragma once #include -#include -#include #include + +// IWYU pragma: begin_exports +#include #include -#include +#include #include +// IWYU pragma: end_exports + +#include #include namespace units { diff --git a/src/core/include/units/quantity_kind.h b/src/core/include/units/quantity_kind.h index 33cbd4e0..ada8a83a 100644 --- a/src/core/include/units/quantity_kind.h +++ b/src/core/include/units/quantity_kind.h @@ -23,8 +23,11 @@ #pragma once +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports + #include #include #include diff --git a/src/core/include/units/quantity_point.h b/src/core/include/units/quantity_point.h index a74793e3..e735ff37 100644 --- a/src/core/include/units/quantity_point.h +++ b/src/core/include/units/quantity_point.h @@ -23,8 +23,13 @@ #pragma once +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports + +#include +#include namespace units { diff --git a/src/core/include/units/quantity_point_kind.h b/src/core/include/units/quantity_point_kind.h index 63e245bc..04fb9ed6 100644 --- a/src/core/include/units/quantity_point_kind.h +++ b/src/core/include/units/quantity_point_kind.h @@ -23,9 +23,11 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include +// IWYU pragma: end_exports namespace units { diff --git a/src/core/include/units/random.h b/src/core/include/units/random.h index 542aaca0..05e42e5e 100644 --- a/src/core/include/units/random.h +++ b/src/core/include/units/random.h @@ -22,9 +22,9 @@ #pragma once +#include #include #include -#include namespace units { diff --git a/src/core/include/units/ratio.h b/src/core/include/units/ratio.h index 17a97613..dcb4956b 100644 --- a/src/core/include/units/ratio.h +++ b/src/core/include/units/ratio.h @@ -22,15 +22,16 @@ #pragma once -#include +// IWYU pragma: begin_exports #include -#include #include +#include #include #include +// IWYU pragma: end_exports + +#include #include -#include -#include #include namespace units { diff --git a/src/core/include/units/symbol_text.h b/src/core/include/units/symbol_text.h index 2b774de3..dc65443f 100644 --- a/src/core/include/units/symbol_text.h +++ b/src/core/include/units/symbol_text.h @@ -22,10 +22,14 @@ #pragma once +// IWYU pragma: begin_exports #include -#include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include namespace units { diff --git a/src/core/include/units/unit.h b/src/core/include/units/unit.h index d4d5fe3c..ef972808 100644 --- a/src/core/include/units/unit.h +++ b/src/core/include/units/unit.h @@ -23,15 +23,15 @@ #pragma once #include -#include #include + +// IWYU pragma: begin_exports +#include #include -#include -#include -#include -#include +#include #include #include +// IWYU pragma: end_exports namespace units { diff --git a/src/systems/isq-iec80000/include/units/isq/iec80000/iec80000.h b/src/systems/isq-iec80000/include/units/isq/iec80000/iec80000.h index f924bb2f..fd518fa4 100644 --- a/src/systems/isq-iec80000/include/units/isq/iec80000/iec80000.h +++ b/src/systems/isq-iec80000/include/units/isq/iec80000/iec80000.h @@ -22,7 +22,9 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include #include +// IWYU pragma: end_exports diff --git a/src/systems/isq-iec80000/include/units/isq/iec80000/modulation_rate.h b/src/systems/isq-iec80000/include/units/isq/iec80000/modulation_rate.h index ed06aa8f..46b7cab4 100644 --- a/src/systems/isq-iec80000/include/units/isq/iec80000/modulation_rate.h +++ b/src/systems/isq-iec80000/include/units/isq/iec80000/modulation_rate.h @@ -23,7 +23,14 @@ #pragma once #include +#include +#include + +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports namespace units::isq::iec80000 { diff --git a/src/systems/isq-iec80000/include/units/isq/iec80000/storage_capacity.h b/src/systems/isq-iec80000/include/units/isq/iec80000/storage_capacity.h index 5bed9626..b41c8142 100644 --- a/src/systems/isq-iec80000/include/units/isq/iec80000/storage_capacity.h +++ b/src/systems/isq-iec80000/include/units/isq/iec80000/storage_capacity.h @@ -24,9 +24,14 @@ #include #include +#include +#include + +// IWYU pragma: begin_exports #include #include -#include +#include +// IWYU pragma: end_exports namespace units::isq::iec80000 { diff --git a/src/systems/isq-iec80000/include/units/isq/iec80000/traffic_intensity.h b/src/systems/isq-iec80000/include/units/isq/iec80000/traffic_intensity.h index 9086906e..7460f4f8 100644 --- a/src/systems/isq-iec80000/include/units/isq/iec80000/traffic_intensity.h +++ b/src/systems/isq-iec80000/include/units/isq/iec80000/traffic_intensity.h @@ -23,9 +23,13 @@ #pragma once #include +#include + +// IWYU pragma: begin_exports #include #include -#include +#include +// IWYU pragma: end_exports namespace units::isq::iec80000 { diff --git a/src/systems/isq-iec80000/include/units/isq/iec80000/transfer_rate.h b/src/systems/isq-iec80000/include/units/isq/iec80000/transfer_rate.h index f5204e3c..cb8fe13a 100644 --- a/src/systems/isq-iec80000/include/units/isq/iec80000/transfer_rate.h +++ b/src/systems/isq-iec80000/include/units/isq/iec80000/transfer_rate.h @@ -25,7 +25,12 @@ #include #include #include +#include + +// IWYU pragma: begin_exports #include +#include +// IWYU pragma: end_exports namespace units::isq::iec80000 { diff --git a/src/systems/isq-natural/include/units/isq/natural/constants.h b/src/systems/isq-natural/include/units/isq/natural/constants.h index b13b9f3b..4d76aa0e 100644 --- a/src/systems/isq-natural/include/units/isq/natural/constants.h +++ b/src/systems/isq-natural/include/units/isq/natural/constants.h @@ -22,7 +22,7 @@ #pragma once -#include +#include namespace units::isq::natural { diff --git a/src/systems/isq-natural/include/units/isq/natural/bits/dimensions.h b/src/systems/isq-natural/include/units/isq/natural/dimensions.h similarity index 96% rename from src/systems/isq-natural/include/units/isq/natural/bits/dimensions.h rename to src/systems/isq-natural/include/units/isq/natural/dimensions.h index 274a385c..1836543b 100644 --- a/src/systems/isq-natural/include/units/isq/natural/bits/dimensions.h +++ b/src/systems/isq-natural/include/units/isq/natural/dimensions.h @@ -22,9 +22,11 @@ #pragma once +// IWYU pragma: begin_exports #include -#include +#include #include +// IWYU pragma: end_exports namespace units::isq::natural { diff --git a/src/systems/isq-natural/include/units/isq/natural/natural.h b/src/systems/isq-natural/include/units/isq/natural/natural.h index 601ce01d..d4e99c24 100644 --- a/src/systems/isq-natural/include/units/isq/natural/natural.h +++ b/src/systems/isq-natural/include/units/isq/natural/natural.h @@ -22,9 +22,8 @@ #pragma once -#define MP_UNITS_SYSTEM_NATURAL - -#include "bits/dimensions.h" -#include "bits/units.h" - +// IWYU pragma: begin_exports +#include "dimensions.h" +#include "units.h" #include "constants.h" +// IWYU pragma: end_exports diff --git a/src/systems/isq-natural/include/units/isq/natural/bits/units.h b/src/systems/isq-natural/include/units/isq/natural/units.h similarity index 95% rename from src/systems/isq-natural/include/units/isq/natural/bits/units.h rename to src/systems/isq-natural/include/units/isq/natural/units.h index 837a0c80..f3fcc54b 100644 --- a/src/systems/isq-natural/include/units/isq/natural/bits/units.h +++ b/src/systems/isq-natural/include/units/isq/natural/units.h @@ -22,8 +22,12 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include +// IWYU pragma: end_exports + #include +#include namespace units::isq::natural { diff --git a/src/systems/isq/include/units/isq/dimensions.h b/src/systems/isq/include/units/isq/dimensions.h index ec8d9473..a4e8dd1d 100644 --- a/src/systems/isq/include/units/isq/dimensions.h +++ b/src/systems/isq/include/units/isq/dimensions.h @@ -22,6 +22,7 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include @@ -68,3 +69,4 @@ #include #include #include +// IWYU pragma: end_exports diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/acceleration.h b/src/systems/si-cgs/include/units/isq/si/cgs/acceleration.h index da7eb009..f91d4d4a 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/acceleration.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/acceleration.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/area.h b/src/systems/si-cgs/include/units/isq/si/cgs/area.h index d641b9ad..bdc1ca09 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/area.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/area.h @@ -22,9 +22,16 @@ #pragma once +// IWYU pragma: begin_exports +#include #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/cgs.h b/src/systems/si-cgs/include/units/isq/si/cgs/cgs.h index 2f4723f7..4a74121e 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/cgs.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/cgs.h @@ -22,6 +22,7 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include @@ -33,3 +34,4 @@ #include #include #include +// IWYU pragma: end_exports diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/energy.h b/src/systems/si-cgs/include/units/isq/si/cgs/energy.h index 4b64ace8..9e4d2dc7 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/energy.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/energy.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/force.h b/src/systems/si-cgs/include/units/isq/si/cgs/force.h index a99039b7..2fe9a1eb 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/force.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/force.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/length.h b/src/systems/si-cgs/include/units/isq/si/cgs/length.h index 0042a230..78bf5f89 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/length.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/length.h @@ -22,8 +22,15 @@ #pragma once +// IWYU pragma: begin_exports +#include #include #include +#include +#include +// IWYU pragma: end_exports + +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/mass.h b/src/systems/si-cgs/include/units/isq/si/cgs/mass.h index 84968df1..ed599f37 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/mass.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/mass.h @@ -22,8 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/power.h b/src/systems/si-cgs/include/units/isq/si/cgs/power.h index 6ce921d7..9bec8b68 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/power.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/power.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/pressure.h b/src/systems/si-cgs/include/units/isq/si/cgs/pressure.h index 27c8d0fb..5739af99 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/pressure.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/pressure.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/speed.h b/src/systems/si-cgs/include/units/isq/si/cgs/speed.h index 59b9022e..c054965c 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/speed.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/speed.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::cgs { diff --git a/src/systems/si-cgs/include/units/isq/si/cgs/time.h b/src/systems/si-cgs/include/units/isq/si/cgs/time.h index 9e2075ec..0d855b37 100644 --- a/src/systems/si-cgs/include/units/isq/si/cgs/time.h +++ b/src/systems/si-cgs/include/units/isq/si/cgs/time.h @@ -22,8 +22,13 @@ #pragma once +// IWYU pragma: begin_exports +#include #include #include +#include +#include +// IWYU pragma: end_exports namespace units::isq::si::cgs { diff --git a/src/systems/si-fps/include/units/isq/si/fps/acceleration.h b/src/systems/si-fps/include/units/isq/si/fps/acceleration.h index 1007eea7..9670702d 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/acceleration.h +++ b/src/systems/si-fps/include/units/isq/si/fps/acceleration.h @@ -22,9 +22,14 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/area.h b/src/systems/si-fps/include/units/isq/si/fps/area.h index 92a5c0b1..fa78f507 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/area.h +++ b/src/systems/si-fps/include/units/isq/si/fps/area.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/density.h b/src/systems/si-fps/include/units/isq/si/fps/density.h index bc164436..2bb87f89 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/density.h +++ b/src/systems/si-fps/include/units/isq/si/fps/density.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/energy.h b/src/systems/si-fps/include/units/isq/si/fps/energy.h index 8971679e..1877850b 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/energy.h +++ b/src/systems/si-fps/include/units/isq/si/fps/energy.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::fps { @@ -37,12 +42,9 @@ struct dim_energy : isq::dim_energy {}; - - template U, Representation Rep = double> using energy = quantity; - inline namespace literals { // foot poundal @@ -55,11 +57,4 @@ constexpr auto operator"" _q_ft_lbf(long double l) { return energy{}; -inline constexpr auto ft_lbf = reference{}; - -} // namespace references - } // namespace units::isq::si::fps diff --git a/src/systems/si-fps/include/units/isq/si/fps/force.h b/src/systems/si-fps/include/units/isq/si/fps/force.h index 3c568556..1ffba0bb 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/force.h +++ b/src/systems/si-fps/include/units/isq/si/fps/force.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/fps.h b/src/systems/si-fps/include/units/isq/si/fps/fps.h index c71f5c45..1bf09cd9 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/fps.h +++ b/src/systems/si-fps/include/units/isq/si/fps/fps.h @@ -22,6 +22,7 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include @@ -35,3 +36,4 @@ #include #include #include +// IWYU pragma: end_exports diff --git a/src/systems/si-fps/include/units/isq/si/fps/length.h b/src/systems/si-fps/include/units/isq/si/fps/length.h index 36d2ce02..75866ac1 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/length.h +++ b/src/systems/si-fps/include/units/isq/si/fps/length.h @@ -22,8 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::fps { @@ -47,8 +54,6 @@ struct mile : named_scaled_unit {}; struct nautical_mile : named_scaled_unit {}; - - struct dim_length : isq::dim_length {}; template U, Representation Rep = double> diff --git a/src/systems/si-fps/include/units/isq/si/fps/mass.h b/src/systems/si-fps/include/units/isq/si/fps/mass.h index 318b02f6..20dc112a 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/mass.h +++ b/src/systems/si-fps/include/units/isq/si/fps/mass.h @@ -22,8 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/power.h b/src/systems/si-fps/include/units/isq/si/fps/power.h index 1fcf36b5..72e57229 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/power.h +++ b/src/systems/si-fps/include/units/isq/si/fps/power.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/pressure.h b/src/systems/si-fps/include/units/isq/si/fps/pressure.h index 3e9791a9..7adf7c81 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/pressure.h +++ b/src/systems/si-fps/include/units/isq/si/fps/pressure.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/speed.h b/src/systems/si-fps/include/units/isq/si/fps/speed.h index 35c0bbef..8a9db5ac 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/speed.h +++ b/src/systems/si-fps/include/units/isq/si/fps/speed.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/time.h b/src/systems/si-fps/include/units/isq/si/fps/time.h index 2ac1eeb6..c9f97bad 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/time.h +++ b/src/systems/si-fps/include/units/isq/si/fps/time.h @@ -22,8 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-fps/include/units/isq/si/fps/volume.h b/src/systems/si-fps/include/units/isq/si/fps/volume.h index e1eabcab..ac732085 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/volume.h +++ b/src/systems/si-fps/include/units/isq/si/fps/volume.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si::fps { diff --git a/src/systems/si-iau/include/units/isq/si/iau/iau.h b/src/systems/si-iau/include/units/isq/si/iau/iau.h index 6fc641ce..cf34a093 100644 --- a/src/systems/si-iau/include/units/isq/si/iau/iau.h +++ b/src/systems/si-iau/include/units/isq/si/iau/iau.h @@ -22,4 +22,6 @@ #pragma once +// IWYU pragma: begin_exports #include +// IWYU pragma: end_exports diff --git a/src/systems/si-iau/include/units/isq/si/iau/length.h b/src/systems/si-iau/include/units/isq/si/iau/length.h index 0970666f..b30e0733 100644 --- a/src/systems/si-iau/include/units/isq/si/iau/length.h +++ b/src/systems/si-iau/include/units/isq/si/iau/length.h @@ -23,7 +23,15 @@ #pragma once +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include +#include namespace units::isq::si::iau { diff --git a/src/systems/si-imperial/include/units/isq/si/imperial/imperial.h b/src/systems/si-imperial/include/units/isq/si/imperial/imperial.h index 1031971e..09d40ffe 100644 --- a/src/systems/si-imperial/include/units/isq/si/imperial/imperial.h +++ b/src/systems/si-imperial/include/units/isq/si/imperial/imperial.h @@ -22,4 +22,6 @@ #pragma once +// IWYU pragma: begin_exports #include +// IWYU pragma: end_exports diff --git a/src/systems/si-imperial/include/units/isq/si/imperial/length.h b/src/systems/si-imperial/include/units/isq/si/imperial/length.h index d4d86056..62e9cc7f 100644 --- a/src/systems/si-imperial/include/units/isq/si/imperial/length.h +++ b/src/systems/si-imperial/include/units/isq/si/imperial/length.h @@ -22,7 +22,15 @@ #pragma once +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include +#include namespace units::isq::si::imperial { diff --git a/src/systems/si-international/include/units/isq/si/international/area.h b/src/systems/si-international/include/units/isq/si/international/area.h index 5acfb01c..a87ff644 100644 --- a/src/systems/si-international/include/units/isq/si/international/area.h +++ b/src/systems/si-international/include/units/isq/si/international/area.h @@ -22,8 +22,16 @@ #pragma once +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include #include +#include namespace units::isq::si::international { diff --git a/src/systems/si-international/include/units/isq/si/international/international.h b/src/systems/si-international/include/units/isq/si/international/international.h index 4a2c1242..9bdc7ec4 100644 --- a/src/systems/si-international/include/units/isq/si/international/international.h +++ b/src/systems/si-international/include/units/isq/si/international/international.h @@ -22,8 +22,10 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include #include +// IWYU pragma: end_exports diff --git a/src/systems/si-international/include/units/isq/si/international/length.h b/src/systems/si-international/include/units/isq/si/international/length.h index c80f548a..846a86de 100644 --- a/src/systems/si-international/include/units/isq/si/international/length.h +++ b/src/systems/si-international/include/units/isq/si/international/length.h @@ -23,7 +23,15 @@ #pragma once +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include +#include namespace units::isq::si::international { diff --git a/src/systems/si-international/include/units/isq/si/international/speed.h b/src/systems/si-international/include/units/isq/si/international/speed.h index 7be951b9..bf63298f 100644 --- a/src/systems/si-international/include/units/isq/si/international/speed.h +++ b/src/systems/si-international/include/units/isq/si/international/speed.h @@ -22,8 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include +#include +#include +// IWYU pragma: end_exports + #include +#include +#include namespace units::isq::si::international { diff --git a/src/systems/si-international/include/units/isq/si/international/volume.h b/src/systems/si-international/include/units/isq/si/international/volume.h index 320d7a03..13dceda6 100644 --- a/src/systems/si-international/include/units/isq/si/international/volume.h +++ b/src/systems/si-international/include/units/isq/si/international/volume.h @@ -22,8 +22,16 @@ #pragma once -#include +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include +#include +#include namespace units::isq::si::international { diff --git a/src/systems/si-typographic/include/units/isq/si/typographic/length.h b/src/systems/si-typographic/include/units/isq/si/typographic/length.h index 8c3fcaa9..10a5e30b 100644 --- a/src/systems/si-typographic/include/units/isq/si/typographic/length.h +++ b/src/systems/si-typographic/include/units/isq/si/typographic/length.h @@ -23,7 +23,15 @@ #pragma once +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include +#include namespace units::isq::si::typographic { diff --git a/src/systems/si-typographic/include/units/isq/si/typographic/typographic.h b/src/systems/si-typographic/include/units/isq/si/typographic/typographic.h index a5d4a789..eae31c9f 100644 --- a/src/systems/si-typographic/include/units/isq/si/typographic/typographic.h +++ b/src/systems/si-typographic/include/units/isq/si/typographic/typographic.h @@ -22,4 +22,6 @@ #pragma once +// IWYU pragma: begin_exports #include +// IWYU pragma: end_exports diff --git a/src/systems/si-us/include/units/isq/si/us/length.h b/src/systems/si-us/include/units/isq/si/us/length.h index 49b9489d..2c7da9d4 100644 --- a/src/systems/si-us/include/units/isq/si/us/length.h +++ b/src/systems/si-us/include/units/isq/si/us/length.h @@ -22,7 +22,15 @@ #pragma once +// IWYU pragma: begin_exports +#include +#include +#include +#include +// IWYU pragma: end_exports + #include +#include namespace units::isq::si::us { diff --git a/src/systems/si-us/include/units/isq/si/us/us.h b/src/systems/si-us/include/units/isq/si/us/us.h index 556b5fa0..648465e8 100644 --- a/src/systems/si-us/include/units/isq/si/us/us.h +++ b/src/systems/si-us/include/units/isq/si/us/us.h @@ -22,4 +22,6 @@ #pragma once +// IWYU pragma: begin_exports #include +// IWYU pragma: end_exports diff --git a/src/systems/si/include/units/isq/si/absorbed_dose.h b/src/systems/si/include/units/isq/si/absorbed_dose.h index 80f5606c..f22805e5 100644 --- a/src/systems/si/include/units/isq/si/absorbed_dose.h +++ b/src/systems/si/include/units/isq/si/absorbed_dose.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/acceleration.h b/src/systems/si/include/units/isq/si/acceleration.h index 7f6101f2..6d57ab0a 100644 --- a/src/systems/si/include/units/isq/si/acceleration.h +++ b/src/systems/si/include/units/isq/si/acceleration.h @@ -22,9 +22,14 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/amount_of_substance.h b/src/systems/si/include/units/isq/si/amount_of_substance.h index ff7303c8..1546217f 100644 --- a/src/systems/si/include/units/isq/si/amount_of_substance.h +++ b/src/systems/si/include/units/isq/si/amount_of_substance.h @@ -22,10 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/angular_velocity.h b/src/systems/si/include/units/isq/si/angular_velocity.h index 20d4400f..d7dc8a79 100644 --- a/src/systems/si/include/units/isq/si/angular_velocity.h +++ b/src/systems/si/include/units/isq/si/angular_velocity.h @@ -22,11 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include - -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/area.h b/src/systems/si/include/units/isq/si/area.h index 9a9fc279..e500b2c5 100644 --- a/src/systems/si/include/units/isq/si/area.h +++ b/src/systems/si/include/units/isq/si/area.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/capacitance.h b/src/systems/si/include/units/isq/si/capacitance.h index 4638ba50..023ed580 100644 --- a/src/systems/si/include/units/isq/si/capacitance.h +++ b/src/systems/si/include/units/isq/si/capacitance.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/catalytic_activity.h b/src/systems/si/include/units/isq/si/catalytic_activity.h index a1eddee5..d6ee65aa 100644 --- a/src/systems/si/include/units/isq/si/catalytic_activity.h +++ b/src/systems/si/include/units/isq/si/catalytic_activity.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/charge_density.h b/src/systems/si/include/units/isq/si/charge_density.h index 73e84a18..694419bb 100644 --- a/src/systems/si/include/units/isq/si/charge_density.h +++ b/src/systems/si/include/units/isq/si/charge_density.h @@ -22,11 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/concentration.h b/src/systems/si/include/units/isq/si/concentration.h index a14fb358..5284502c 100644 --- a/src/systems/si/include/units/isq/si/concentration.h +++ b/src/systems/si/include/units/isq/si/concentration.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/conductance.h b/src/systems/si/include/units/isq/si/conductance.h index ce735537..d366c1f6 100644 --- a/src/systems/si/include/units/isq/si/conductance.h +++ b/src/systems/si/include/units/isq/si/conductance.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/current_density.h b/src/systems/si/include/units/isq/si/current_density.h index 06470f69..d67fa67b 100644 --- a/src/systems/si/include/units/isq/si/current_density.h +++ b/src/systems/si/include/units/isq/si/current_density.h @@ -22,11 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/density.h b/src/systems/si/include/units/isq/si/density.h index eb933914..b8acdefe 100644 --- a/src/systems/si/include/units/isq/si/density.h +++ b/src/systems/si/include/units/isq/si/density.h @@ -22,11 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/dynamic_viscosity.h b/src/systems/si/include/units/isq/si/dynamic_viscosity.h index 8439fd1f..1bff6039 100644 --- a/src/systems/si/include/units/isq/si/dynamic_viscosity.h +++ b/src/systems/si/include/units/isq/si/dynamic_viscosity.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { @@ -43,11 +48,5 @@ constexpr auto operator"" _q_Pa_s(long double l) { return dynamic_viscosity{}; - -} // namespace references - } // namespace units::isq::si diff --git a/src/systems/si/include/units/isq/si/electric_charge.h b/src/systems/si/include/units/isq/si/electric_charge.h index 23585a4f..3c13ccf9 100644 --- a/src/systems/si/include/units/isq/si/electric_charge.h +++ b/src/systems/si/include/units/isq/si/electric_charge.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/electric_current.h b/src/systems/si/include/units/isq/si/electric_current.h index 3405eb3e..ae200405 100644 --- a/src/systems/si/include/units/isq/si/electric_current.h +++ b/src/systems/si/include/units/isq/si/electric_current.h @@ -22,10 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/electric_field_strength.h b/src/systems/si/include/units/isq/si/electric_field_strength.h index a67519c0..dcc3e60b 100644 --- a/src/systems/si/include/units/isq/si/electric_field_strength.h +++ b/src/systems/si/include/units/isq/si/electric_field_strength.h @@ -22,9 +22,14 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/energy.h b/src/systems/si/include/units/isq/si/energy.h index 50efc43d..b69b71d9 100644 --- a/src/systems/si/include/units/isq/si/energy.h +++ b/src/systems/si/include/units/isq/si/energy.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/energy_density.h b/src/systems/si/include/units/isq/si/energy_density.h index afcf1c74..46fb4ee1 100644 --- a/src/systems/si/include/units/isq/si/energy_density.h +++ b/src/systems/si/include/units/isq/si/energy_density.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/force.h b/src/systems/si/include/units/isq/si/force.h index d75fbae8..e16efdac 100644 --- a/src/systems/si/include/units/isq/si/force.h +++ b/src/systems/si/include/units/isq/si/force.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/frequency.h b/src/systems/si/include/units/isq/si/frequency.h index 6207b086..81d7e357 100644 --- a/src/systems/si/include/units/isq/si/frequency.h +++ b/src/systems/si/include/units/isq/si/frequency.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/heat_capacity.h b/src/systems/si/include/units/isq/si/heat_capacity.h index 0d62f39b..5d33c869 100644 --- a/src/systems/si/include/units/isq/si/heat_capacity.h +++ b/src/systems/si/include/units/isq/si/heat_capacity.h @@ -22,12 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/inductance.h b/src/systems/si/include/units/isq/si/inductance.h index 9c8d4cdd..604771b0 100644 --- a/src/systems/si/include/units/isq/si/inductance.h +++ b/src/systems/si/include/units/isq/si/inductance.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/length.h b/src/systems/si/include/units/isq/si/length.h index d51b93e8..8dd5c232 100644 --- a/src/systems/si/include/units/isq/si/length.h +++ b/src/systems/si/include/units/isq/si/length.h @@ -22,10 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/luminance.h b/src/systems/si/include/units/isq/si/luminance.h index bb0b0e15..7819b55b 100644 --- a/src/systems/si/include/units/isq/si/luminance.h +++ b/src/systems/si/include/units/isq/si/luminance.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/luminous_intensity.h b/src/systems/si/include/units/isq/si/luminous_intensity.h index d874f9f7..56ff3913 100644 --- a/src/systems/si/include/units/isq/si/luminous_intensity.h +++ b/src/systems/si/include/units/isq/si/luminous_intensity.h @@ -22,10 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/magnetic_flux.h b/src/systems/si/include/units/isq/si/magnetic_flux.h index a52dd447..ca3d05a5 100644 --- a/src/systems/si/include/units/isq/si/magnetic_flux.h +++ b/src/systems/si/include/units/isq/si/magnetic_flux.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/magnetic_induction.h b/src/systems/si/include/units/isq/si/magnetic_induction.h index 51b5d9fd..dff0c40f 100644 --- a/src/systems/si/include/units/isq/si/magnetic_induction.h +++ b/src/systems/si/include/units/isq/si/magnetic_induction.h @@ -22,12 +22,18 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/mass.h b/src/systems/si/include/units/isq/si/mass.h index 4f9c46a3..bcfc91a4 100644 --- a/src/systems/si/include/units/isq/si/mass.h +++ b/src/systems/si/include/units/isq/si/mass.h @@ -22,10 +22,15 @@ #pragma once -#include +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/molar_energy.h b/src/systems/si/include/units/isq/si/molar_energy.h index 0da59154..1982ebb8 100644 --- a/src/systems/si/include/units/isq/si/molar_energy.h +++ b/src/systems/si/include/units/isq/si/molar_energy.h @@ -22,11 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/momentum.h b/src/systems/si/include/units/isq/si/momentum.h index 1170277e..91d001d2 100644 --- a/src/systems/si/include/units/isq/si/momentum.h +++ b/src/systems/si/include/units/isq/si/momentum.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/permeability.h b/src/systems/si/include/units/isq/si/permeability.h index ccfb59a7..a26dbe4d 100644 --- a/src/systems/si/include/units/isq/si/permeability.h +++ b/src/systems/si/include/units/isq/si/permeability.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/permittivity.h b/src/systems/si/include/units/isq/si/permittivity.h index 7ca432c0..bf372b27 100644 --- a/src/systems/si/include/units/isq/si/permittivity.h +++ b/src/systems/si/include/units/isq/si/permittivity.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/power.h b/src/systems/si/include/units/isq/si/power.h index 3d06db80..19d248a7 100644 --- a/src/systems/si/include/units/isq/si/power.h +++ b/src/systems/si/include/units/isq/si/power.h @@ -22,10 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/pressure.h b/src/systems/si/include/units/isq/si/pressure.h index c04da60b..94005a93 100644 --- a/src/systems/si/include/units/isq/si/pressure.h +++ b/src/systems/si/include/units/isq/si/pressure.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/radioactivity.h b/src/systems/si/include/units/isq/si/radioactivity.h index 16c58d16..4d216e1a 100644 --- a/src/systems/si/include/units/isq/si/radioactivity.h +++ b/src/systems/si/include/units/isq/si/radioactivity.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/resistance.h b/src/systems/si/include/units/isq/si/resistance.h index 7e792232..85b99dc6 100644 --- a/src/systems/si/include/units/isq/si/resistance.h +++ b/src/systems/si/include/units/isq/si/resistance.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/si.h b/src/systems/si/include/units/isq/si/si.h index d56852a3..957fa4b3 100644 --- a/src/systems/si/include/units/isq/si/si.h +++ b/src/systems/si/include/units/isq/si/si.h @@ -22,6 +22,7 @@ #pragma once +// IWYU pragma: begin_exports #include #include #include @@ -72,3 +73,4 @@ #include #include +// IWYU pragma: end_exports diff --git a/src/systems/si/include/units/isq/si/speed.h b/src/systems/si/include/units/isq/si/speed.h index 531f9aa2..5224a99f 100644 --- a/src/systems/si/include/units/isq/si/speed.h +++ b/src/systems/si/include/units/isq/si/speed.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/surface_tension.h b/src/systems/si/include/units/isq/si/surface_tension.h index d541cfcf..2ddff6d6 100644 --- a/src/systems/si/include/units/isq/si/surface_tension.h +++ b/src/systems/si/include/units/isq/si/surface_tension.h @@ -22,9 +22,14 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/thermal_conductivity.h b/src/systems/si/include/units/isq/si/thermal_conductivity.h index c8c8da31..5e585091 100644 --- a/src/systems/si/include/units/isq/si/thermal_conductivity.h +++ b/src/systems/si/include/units/isq/si/thermal_conductivity.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/thermodynamic_temperature.h b/src/systems/si/include/units/isq/si/thermodynamic_temperature.h index a9e38f78..40a0b81b 100644 --- a/src/systems/si/include/units/isq/si/thermodynamic_temperature.h +++ b/src/systems/si/include/units/isq/si/thermodynamic_temperature.h @@ -22,9 +22,14 @@ #pragma once -#include +// IWYU pragma: begin_exports #include #include +#include +#include +// IWYU pragma: end_exports + +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/time.h b/src/systems/si/include/units/isq/si/time.h index 35edbb86..ef59e301 100644 --- a/src/systems/si/include/units/isq/si/time.h +++ b/src/systems/si/include/units/isq/si/time.h @@ -22,10 +22,15 @@ #pragma once +// IWYU pragma: begin_exports +#include #include +#include +// IWYU pragma: end_exports + #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/torque.h b/src/systems/si/include/units/isq/si/torque.h index 7cb8a835..54923e8a 100644 --- a/src/systems/si/include/units/isq/si/torque.h +++ b/src/systems/si/include/units/isq/si/torque.h @@ -22,11 +22,16 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { @@ -45,10 +50,4 @@ constexpr auto operator"" _q_Nm_per_rad(long double l) { return torque{}; - -} // namespace references - } // namespace units::isq::si diff --git a/src/systems/si/include/units/isq/si/voltage.h b/src/systems/si/include/units/isq/si/voltage.h index 9dad9ae4..4c8c3d24 100644 --- a/src/systems/si/include/units/isq/si/voltage.h +++ b/src/systems/si/include/units/isq/si/voltage.h @@ -22,11 +22,17 @@ #pragma once +// IWYU pragma: begin_exports #include +#include +#include +#include +// IWYU pragma: end_exports + #include #include #include -#include +#include namespace units::isq::si { diff --git a/src/systems/si/include/units/isq/si/volume.h b/src/systems/si/include/units/isq/si/volume.h index 64281fb9..1f126279 100644 --- a/src/systems/si/include/units/isq/si/volume.h +++ b/src/systems/si/include/units/isq/si/volume.h @@ -22,9 +22,15 @@ #pragma once +// IWYU pragma: begin_exports #include -#include #include +#include +#include +// IWYU pragma: end_exports + +#include +#include namespace units::isq::si { diff --git a/test/unit_test/runtime/distribution_test.cpp b/test/unit_test/runtime/distribution_test.cpp index c912d40a..c1c58a26 100644 --- a/test/unit_test/runtime/distribution_test.cpp +++ b/test/unit_test/runtime/distribution_test.cpp @@ -20,10 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include #include #include +#include #include +#include +#include +#include + using namespace units; using namespace units::isq::si; diff --git a/test/unit_test/runtime/fmt_test.cpp b/test/unit_test/runtime/fmt_test.cpp index 9fb94f2a..0c6ecc2b 100644 --- a/test/unit_test/runtime/fmt_test.cpp +++ b/test/unit_test/runtime/fmt_test.cpp @@ -20,14 +20,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include #include -#include -#include +#include #include +#include +#include // IWYU pragma: keep #include #include #include -#include +#include +#include using namespace units; using namespace units::isq; diff --git a/test/unit_test/runtime/fmt_units_test.cpp b/test/unit_test/runtime/fmt_units_test.cpp index 9ea97968..1dde0460 100644 --- a/test/unit_test/runtime/fmt_units_test.cpp +++ b/test/unit_test/runtime/fmt_units_test.cpp @@ -20,22 +20,20 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/bits/external/hacks.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #if defined(UNITS_COMP_MSVC) #pragma warning( disable : 4459 ) // Disable shadowing warning. #endif -#include "units/format.h" -#include "units/isq/iec80000/iec80000.h" -#include "units/isq/si/si.h" -#include "units/isq/si/iau/iau.h" -#include "units/isq/si/imperial/imperial.h" -#include "units/isq/si/international/international.h" -#include "units/isq/si/typographic/typographic.h" -#include "units/isq/si/us/us.h" -#include - using namespace units::isq::si; using namespace units::isq::si::references; using namespace units::isq::si::international; diff --git a/test/unit_test/runtime/math_test.cpp b/test/unit_test/runtime/math_test.cpp index a64c09f9..8835ae25 100644 --- a/test/unit_test/runtime/math_test.cpp +++ b/test/unit_test/runtime/math_test.cpp @@ -20,10 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/math.h" -#include "units/isq/si/area.h" -#include "units/isq/si/volume.h" +#include +#include +#include +#include #include +#include using namespace units; using namespace units::isq::si; diff --git a/test/unit_test/static/cgs_test.cpp b/test/unit_test/static/cgs_test.cpp index 1d25c965..5a268fb5 100644 --- a/test/unit_test/static/cgs_test.cpp +++ b/test/unit_test/static/cgs_test.cpp @@ -20,17 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include namespace { diff --git a/test/unit_test/static/chrono_test.cpp b/test/unit_test/static/chrono_test.cpp index 709fdbf5..ec556723 100644 --- a/test/unit_test/static/chrono_test.cpp +++ b/test/unit_test/static/chrono_test.cpp @@ -20,10 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "test_tools.h" +#include #include +#include #include #include +#include namespace { diff --git a/test/unit_test/static/concepts_test.cpp b/test/unit_test/static/concepts_test.cpp index 94d74159..fd0ce1f2 100644 --- a/test/unit_test/static/concepts_test.cpp +++ b/test/unit_test/static/concepts_test.cpp @@ -20,16 +20,22 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/isq/si/cgs/speed.h" -#include "units/isq/si/speed.h" -#include "units/isq/si/fps/speed.h" -#include "units/quantity_point.h" -#include "units/chrono.h" +#include +#include // IWYU pragma: keep +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include +#include #include #include #include #include +#include #include +#include namespace { diff --git a/test/unit_test/static/custom_rep_test_min_expl.cpp b/test/unit_test/static/custom_rep_test_min_expl.cpp index 1060da14..9ab08c97 100644 --- a/test/unit_test/static/custom_rep_test_min_expl.cpp +++ b/test/unit_test/static/custom_rep_test_min_expl.cpp @@ -20,8 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/isq/si/length.h" +#include +#include +#include #include +#include namespace { diff --git a/test/unit_test/static/custom_rep_test_min_impl.cpp b/test/unit_test/static/custom_rep_test_min_impl.cpp index b2fc2f39..093b037c 100644 --- a/test/unit_test/static/custom_rep_test_min_impl.cpp +++ b/test/unit_test/static/custom_rep_test_min_impl.cpp @@ -20,11 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/math.h" -#include "units/isq/si/length.h" -#include +#include +#include #include -#include namespace { diff --git a/test/unit_test/static/custom_unit_test.cpp b/test/unit_test/static/custom_unit_test.cpp index f456109c..12af712e 100644 --- a/test/unit_test/static/custom_unit_test.cpp +++ b/test/unit_test/static/custom_unit_test.cpp @@ -21,11 +21,14 @@ // SOFTWARE. #include "test_tools.h" -#include -#include -#include +#include +#include #include -#include +#include +#include +#include +#include // IWYU pragma: keep +#include namespace { diff --git a/test/unit_test/static/dimension_op_test.cpp b/test/unit_test/static/dimension_op_test.cpp index 03a3decb..64daefbd 100644 --- a/test/unit_test/static/dimension_op_test.cpp +++ b/test/unit_test/static/dimension_op_test.cpp @@ -20,9 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/bits/dimension_op.h" -#include "units/unit.h" -#include +#include +#include +#include +#include +#include using namespace units; @@ -44,9 +46,6 @@ static_assert(is_same_v>, units::exponen // dim_unpack -template -struct typeinfo; - template using dim_unpack = TYPENAME detail::dim_unpack::type; diff --git a/test/unit_test/static/fixed_string_test.cpp b/test/unit_test/static/fixed_string_test.cpp index ce2c8abc..e47fe358 100644 --- a/test/unit_test/static/fixed_string_test.cpp +++ b/test/unit_test/static/fixed_string_test.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/bits/external/fixed_string.h" +#include using namespace units; diff --git a/test/unit_test/static/fps_test.cpp b/test/unit_test/static/fps_test.cpp index 60a994e9..5581f1df 100644 --- a/test/unit_test/static/fps_test.cpp +++ b/test/unit_test/static/fps_test.cpp @@ -21,15 +21,8 @@ // SOFTWARE. #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include namespace { diff --git a/test/unit_test/static/iec80000_test.cpp b/test/unit_test/static/iec80000_test.cpp index 5a524385..c947914c 100644 --- a/test/unit_test/static/iec80000_test.cpp +++ b/test/unit_test/static/iec80000_test.cpp @@ -21,6 +21,7 @@ // SOFTWARE. #include +#include /* ************** DERIVED DIMENSIONS THAT INCLUDE UNITS WITH SPECIAL NAMES **************** */ diff --git a/test/unit_test/static/kind_test.cpp b/test/unit_test/static/kind_test.cpp index a75927aa..37d43849 100644 --- a/test/unit_test/static/kind_test.cpp +++ b/test/unit_test/static/kind_test.cpp @@ -20,12 +20,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "test_tools.h" -#include "units/generic/angle.h" -#include "units/kind.h" -#include "units/isq/si/length.h" -#include "units/isq/si/area.h" -#include "units/isq/si/speed.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace units; using namespace isq::si; diff --git a/test/unit_test/static/math_test.cpp b/test/unit_test/static/math_test.cpp index cbab7894..46004d8c 100644 --- a/test/unit_test/static/math_test.cpp +++ b/test/unit_test/static/math_test.cpp @@ -20,12 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/math.h" #include "test_tools.h" -#include "units/isq/si/area.h" -#include "units/isq/si/volume.h" -#include "units/isq/si/international/area.h" -#include "units/isq/si/international/volume.h" +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/quantity_kind_test.cpp b/test/unit_test/static/quantity_kind_test.cpp index cb072fe2..42c4485d 100644 --- a/test/unit_test/static/quantity_kind_test.cpp +++ b/test/unit_test/static/quantity_kind_test.cpp @@ -21,17 +21,21 @@ // SOFTWARE. #include "test_tools.h" -#include "units/chrono.h" -#include "units/isq/si/cgs/speed.h" -#include "units/isq/si/area.h" -#include "units/isq/si/frequency.h" -#include "units/isq/si/speed.h" -#include "units/isq/si/fps/speed.h" -#include "units/quantity_point.h" -#include "units/quantity_kind.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include #include +#include +#include namespace { diff --git a/test/unit_test/static/quantity_point_kind_test.cpp b/test/unit_test/static/quantity_point_kind_test.cpp index 34dbe278..df8cb952 100644 --- a/test/unit_test/static/quantity_point_kind_test.cpp +++ b/test/unit_test/static/quantity_point_kind_test.cpp @@ -21,17 +21,18 @@ // SOFTWARE. #include "test_tools.h" -#include "units/chrono.h" -#include "units/isq/si/cgs/speed.h" -#include "units/isq/si/area.h" -#include "units/isq/si/frequency.h" -#include "units/isq/si/speed.h" -#include "units/isq/si/fps/speed.h" -#include "units/quantity_point.h" -#include "units/quantity_point_kind.h" +#include +#include +#include +#include +#include +#include +#include +#include #include -#include #include +#include +#include namespace { diff --git a/test/unit_test/static/quantity_point_test.cpp b/test/unit_test/static/quantity_point_test.cpp index 12f2a66f..acca2573 100644 --- a/test/unit_test/static/quantity_point_test.cpp +++ b/test/unit_test/static/quantity_point_test.cpp @@ -20,14 +20,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/quantity_point.h" +#include #include "test_tools.h" -#include "units/chrono.h" -#include "units/math.h" -#include "units/isq/si/area.h" -#include "units/isq/si/speed.h" -#include "units/isq/si/volume.h" -#include "units/isq/si/us/length.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace { diff --git a/test/unit_test/static/quantity_test.cpp b/test/unit_test/static/quantity_test.cpp index 09f1ae38..507c6382 100644 --- a/test/unit_test/static/quantity_test.cpp +++ b/test/unit_test/static/quantity_test.cpp @@ -21,18 +21,21 @@ // SOFTWARE. #include "test_tools.h" -#include "units/math.h" -#include "units/isq/si/cgs/speed.h" -#include "units/isq/si/area.h" -#include "units/isq/si/frequency.h" -#include "units/isq/si/speed.h" -#include "units/isq/si/volume.h" -#include "units/isq/si/fps/speed.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace { diff --git a/test/unit_test/static/ratio_test.cpp b/test/unit_test/static/ratio_test.cpp index 3462c483..5067d3fa 100644 --- a/test/unit_test/static/ratio_test.cpp +++ b/test/unit_test/static/ratio_test.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/ratio.h" +#include namespace { diff --git a/test/unit_test/static/references_test.cpp b/test/unit_test/static/references_test.cpp index e4b76c5a..2e4f5bd6 100644 --- a/test/unit_test/static/references_test.cpp +++ b/test/unit_test/static/references_test.cpp @@ -20,17 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/bits/external/hacks.h" -#include "units/isq/dimensions/length.h" -#include "units/isq/dimensions/speed.h" -#include "units/isq/si/length.h" -#include "units/isq/si/mass.h" -#include "units/isq/si/time.h" -#include "units/isq/si/area.h" -#include "units/isq/si/speed.h" -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(UNITS_COMP_MSVC) #pragma warning( disable : 4459 ) // Disable shadowing warning. diff --git a/test/unit_test/static/si_cgs_test.cpp b/test/unit_test/static/si_cgs_test.cpp index f99d4b33..9907e480 100644 --- a/test/unit_test/static/si_cgs_test.cpp +++ b/test/unit_test/static/si_cgs_test.cpp @@ -21,25 +21,16 @@ // SOFTWARE. #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include // IWYU pragma: keep +#include #include #include -#include +#include // IWYU pragma: keep #include #include #include #include -#include +#include // IWYU pragma: keep namespace { diff --git a/test/unit_test/static/si_fps_test.cpp b/test/unit_test/static/si_fps_test.cpp index b4e15570..f633feaa 100644 --- a/test/unit_test/static/si_fps_test.cpp +++ b/test/unit_test/static/si_fps_test.cpp @@ -24,16 +24,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include diff --git a/test/unit_test/static/si_test.cpp b/test/unit_test/static/si_test.cpp index 1afe224e..e57bc1f1 100644 --- a/test/unit_test/static/si_test.cpp +++ b/test/unit_test/static/si_test.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "test_tools.h" -#include +#include +#include #include namespace { diff --git a/test/unit_test/static/symbol_text_test.cpp b/test/unit_test/static/symbol_text_test.cpp index bdc2b42a..c1e4ffd5 100644 --- a/test/unit_test/static/symbol_text_test.cpp +++ b/test/unit_test/static/symbol_text_test.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/symbol_text.h" +#include using namespace units; diff --git a/test/unit_test/static/test_tools.h b/test/unit_test/static/test_tools.h index 440faa9d..8ddfbca9 100644 --- a/test/unit_test/static/test_tools.h +++ b/test/unit_test/static/test_tools.h @@ -22,7 +22,7 @@ #pragma once -#include "units/bits/equivalent.h" +#include #include #include #include diff --git a/test/unit_test/static/type_list_test.cpp b/test/unit_test/static/type_list_test.cpp index 3f77fd4d..d4ea9dcd 100644 --- a/test/unit_test/static/type_list_test.cpp +++ b/test/unit_test/static/type_list_test.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/bits/external/type_list.h" -#include "units/derived_dimension.h" -#include "units/unit.h" -#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/unit_test.cpp b/test/unit_test/static/unit_test.cpp index 28823f70..f8d0315d 100644 --- a/test/unit_test/static/unit_test.cpp +++ b/test/unit_test/static/unit_test.cpp @@ -21,9 +21,12 @@ // SOFTWARE. #include "test_tools.h" -#include "units/unit.h" -#include "units/bits/equivalent.h" -#include "units/isq/si/prefixes.h" +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/us_test.cpp b/test/unit_test/static/us_test.cpp index 07ef18a5..024f0eb7 100644 --- a/test/unit_test/static/us_test.cpp +++ b/test/unit_test/static/us_test.cpp @@ -20,9 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include -#include +#include +#include +#include namespace {