mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-04 20:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: fps can now coexist with international system

Browse Source 
Resolves #347
This commit is contained in:
Mateusz Pusz
2022-05-09 14:01:08 +02:00
parent a7f1817c9b
commit 8b52f46bed
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/systems/si-fps/CMakeLists.txt
View File

@@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 3.19)
add_units_module(
si-fps
DEPENDENCIES mp-units::si
DEPENDENCIES mp-units::si-international
HEADERS include/units/isq/si/fps/acceleration.h
include/units/isq/si/fps/area.h
include/units/isq/si/fps/density.h

19
src/systems/si-fps/include/units/isq/si/fps/length.h
View File

@@ -29,24 +29,21 @@
#include <units/symbol_text.h>
// IWYU pragma: end_exports
#include <units/isq/si/length.h>
#include <units/isq/si/international/length.h>
#include <units/unit.h>
namespace units::isq::si::fps {
// https://en.wikipedia.org/wiki/Foot_(unit)
struct foot : named_scaled_unit<foot, "ft", no_prefix, ratio(3'048, 1'000, -1), si::metre> {};
struct inch : named_scaled_unit<inch, "in", no_prefix, ratio(1, 12), foot> {};
using si::international::fathom;
using si::international::foot;
using si::international::inch;
using si::international::mil;
using si::international::thou;
using si::international::yard;
// thousandth of an inch
struct thousandth : named_scaled_unit<thousandth, "thou", no_prefix, ratio(1, 1'000), inch> {};
struct thou : alias_unit<thousandth, "thou", no_prefix> {};
struct mil : alias_unit<thousandth, "mil", no_prefix> {};
struct yard : named_scaled_unit<yard, "yd", si::prefix, ratio(3, 1), foot> {};
struct fathom : named_scaled_unit<fathom, "ftm", no_prefix, ratio(6, 1), foot> {};
struct thousandth : alias_unit<thou, "thou", no_prefix> {};
struct kiloyard : prefixed_unit<kiloyard, si::kilo, yard> {};