diff --git a/docs/users_guide/framework_basics/design_overview.md b/docs/users_guide/framework_basics/design_overview.md index a63a6846d..7446bea7f 100644 --- a/docs/users_guide/framework_basics/design_overview.md +++ b/docs/users_guide/framework_basics/design_overview.md @@ -53,7 +53,7 @@ For example: _luminous intensity_ ($\mathsf{J}$) are the base dimensions of the [ISQ](../../appendix/glossary.md#isq). - A derived dimension of _force_ in the [ISQ](../../appendix/glossary.md#isq) is denoted by $\textsf{dim }F = \mathsf{LMT}^{–2}$. -- The implementation of IEC 80000 in this library provides `iec80000::dim_traffic_intensity` +- The implementation of IEC 80000 in this library provides `iec::dim_traffic_intensity` base dimension to extend ISQ with strong information technology quantities. [Base dimensions](../../appendix/glossary.md#base-dimension) can be defined by the user in diff --git a/src/systems/CMakeLists.txt b/src/systems/CMakeLists.txt index 1d7681bcb..81fd2abd8 100644 --- a/src/systems/CMakeLists.txt +++ b/src/systems/CMakeLists.txt @@ -24,10 +24,10 @@ add_mp_units_module( systems mp-units-systems DEPENDENCIES mp-units::core HEADERS include/mp-units/systems/angular/units.h - include/mp-units/systems/iec80000/binary_prefixes.h - include/mp-units/systems/iec80000/quantities.h - include/mp-units/systems/iec80000/unit_symbols.h - include/mp-units/systems/iec80000/units.h + include/mp-units/systems/iec/binary_prefixes.h + include/mp-units/systems/iec/quantities.h + include/mp-units/systems/iec/unit_symbols.h + include/mp-units/systems/iec/units.h include/mp-units/systems/isq/atomic_and_nuclear_physics.h include/mp-units/systems/isq/base_quantities.h include/mp-units/systems/isq/electromagnetism.h @@ -44,7 +44,7 @@ add_mp_units_module( include/mp-units/systems/cgs.h include/mp-units/systems/hep.h include/mp-units/systems/iau.h - include/mp-units/systems/iec80000.h + include/mp-units/systems/iec.h include/mp-units/systems/imperial.h include/mp-units/systems/international.h include/mp-units/systems/isq.h diff --git a/src/systems/include/mp-units/systems/iec80000.h b/src/systems/include/mp-units/systems/iec.h similarity index 86% rename from src/systems/include/mp-units/systems/iec80000.h rename to src/systems/include/mp-units/systems/iec.h index 0b19046b2..d46b9125b 100644 --- a/src/systems/include/mp-units/systems/iec80000.h +++ b/src/systems/include/mp-units/systems/iec.h @@ -23,10 +23,10 @@ #pragma once // IWYU pragma: begin_exports -#include -#include -#include -#include +#include +#include +#include +#include #ifndef MP_UNITS_IN_MODULE_INTERFACE #include diff --git a/src/systems/include/mp-units/systems/iec80000/binary_prefixes.h b/src/systems/include/mp-units/systems/iec/binary_prefixes.h similarity index 97% rename from src/systems/include/mp-units/systems/iec80000/binary_prefixes.h rename to src/systems/include/mp-units/systems/iec/binary_prefixes.h index e09a218d2..9249eba6d 100644 --- a/src/systems/include/mp-units/systems/iec80000/binary_prefixes.h +++ b/src/systems/include/mp-units/systems/iec/binary_prefixes.h @@ -28,7 +28,7 @@ #include #endif -namespace mp_units::iec80000 { +namespace mp_units::iec { // clang-format off template struct kibi_ final : prefixed_unit<"Ki", mag_power<2, 10>, U{}> {}; @@ -54,4 +54,4 @@ template constexpr yobi_ -#include -#include +#include +#include #include MP_UNITS_EXPORT -namespace mp_units::iec80000::unit_symbols { +namespace mp_units::iec::unit_symbols { // bit inline constexpr auto kbit = si::kilo; @@ -108,4 +108,4 @@ inline constexpr auto QBd = si::quetta; // TODO do we need prefixed versions of Erlang? inline constexpr auto E = erlang; -} // namespace mp_units::iec80000::unit_symbols +} // namespace mp_units::iec::unit_symbols diff --git a/src/systems/include/mp-units/systems/iec80000/units.h b/src/systems/include/mp-units/systems/iec/units.h similarity index 94% rename from src/systems/include/mp-units/systems/iec80000/units.h rename to src/systems/include/mp-units/systems/iec/units.h index 4d1ee0983..613c2535d 100644 --- a/src/systems/include/mp-units/systems/iec80000/units.h +++ b/src/systems/include/mp-units/systems/iec/units.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #ifndef MP_UNITS_IN_MODULE_INTERFACE @@ -31,7 +31,7 @@ #endif MP_UNITS_EXPORT -namespace mp_units::iec80000 { +namespace mp_units::iec { // clang-format off inline constexpr struct erlang final : named_unit<"E", kind_of> {} erlang; @@ -41,4 +41,4 @@ inline constexpr struct byte final : named_unit<"B", mag<8> * bit> {} byte; inline constexpr struct baud final : named_unit<"Bd", one / si::second, kind_of> {} baud; // clang-format on -} // namespace mp_units::iec80000 +} // namespace mp_units::iec diff --git a/src/systems/mp-units-systems.cpp b/src/systems/mp-units-systems.cpp index 6c2207ee4..72b8f7174 100644 --- a/src/systems/mp-units-systems.cpp +++ b/src/systems/mp-units-systems.cpp @@ -38,7 +38,7 @@ import std; #include #include #include -#include +#include #include #include #include diff --git a/test/static/CMakeLists.txt b/test/static/CMakeLists.txt index 2d8b5f67a..a16b1edc5 100644 --- a/test/static/CMakeLists.txt +++ b/test/static/CMakeLists.txt @@ -39,7 +39,7 @@ add_library( fixed_string_test.cpp hep_test.cpp iau_test.cpp - iec80000_test.cpp + iec_test.cpp imperial_test.cpp international_test.cpp isq_test.cpp diff --git a/test/static/iec80000_test.cpp b/test/static/iec_test.cpp similarity index 97% rename from test/static/iec80000_test.cpp rename to test/static/iec_test.cpp index 289d403ec..6d5825c59 100644 --- a/test/static/iec80000_test.cpp +++ b/test/static/iec_test.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include #include @@ -29,8 +29,8 @@ namespace { using namespace mp_units; -using namespace mp_units::iec80000; -using namespace mp_units::iec80000::unit_symbols; +using namespace mp_units::iec; +using namespace mp_units::iec::unit_symbols; using namespace mp_units::si::unit_symbols; using enum mp_units::quantity_character; diff --git a/test/static/unit_symbol_test.cpp b/test/static/unit_symbol_test.cpp index 41af02f2f..c87831be8 100644 --- a/test/static/unit_symbol_test.cpp +++ b/test/static/unit_symbol_test.cpp @@ -21,7 +21,7 @@ // SOFTWARE. #include -#include +#include #include #ifdef MP_UNITS_IMPORT_STD import std; @@ -33,7 +33,7 @@ namespace { using namespace mp_units; using namespace mp_units::si; -using namespace mp_units::iec80000; +using namespace mp_units::iec; using enum text_encoding; using enum unit_symbol_solidus;