Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 17, 2023
1 parent 2e86472 commit ed6e646
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions units/unit_definitions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ namespace precise {
constexpr precise_unit hogshead{63.0, gallon};
constexpr precise_unit cord{128.0, i::foot.pow(3)};
constexpr precise_unit fifth{0.2, gallon};
constexpr precise_unit ale_gallon{282.0,i::inch.pow(3)};
constexpr precise_unit ale_gallon{282.0, i::inch.pow(3)};

/// Us customary dry measurements
namespace dry {
Expand All @@ -433,7 +433,7 @@ namespace precise {
constexpr precise_unit barrel{7056, i::inch.pow(3)};
constexpr precise_unit sack{3.0, bushel};
constexpr precise_unit strike{2.0, bushel};
constexpr precise_unit winchester_gallon{268.8,precise::in.pow(3)};
constexpr precise_unit winchester_gallon{268.8, precise::in.pow(3)};
} // namespace dry
namespace grain {
constexpr precise_unit bushel_corn{56.0, av::pound};
Expand Down
1 change: 0 additions & 1 deletion units/units.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4783,7 +4783,6 @@ static bool cleanUnitStringPhase2(std::string& unit_string)
std::remove(unit_string.begin(), unit_string.end(), '+'),
unit_string.end());


clearEmptySegments(unit_string);
return changed || (len != unit_string.length());
}
Expand Down
8 changes: 5 additions & 3 deletions units/units_conversion_maps.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2207,9 +2207,11 @@ UNITS_CPP14_CONSTEXPR_OBJECT std::array<
{"GAL_US", precise::us::gallon},
{"gallon_US", precise::us::gallon},
{"liquidgallon_US", precise::us::gallon},
{"gal_wi", precise::us::dry::winchester_gallon}, //winchester gallon
{"winchestergallon", precise::us::dry::winchester_gallon}, //winchester gallon
{"corngallon", precise::us::dry::winchester_gallon}, //winchester gallon
{"gal_wi", precise::us::dry::winchester_gallon}, // winchester gallon
{"winchestergallon",
precise::us::dry::winchester_gallon}, // winchester gallon
{"corngallon",
precise::us::dry::winchester_gallon}, // winchester gallon
{"alegallon", precise::us::ale_gallon},
{"wigal", precise::imp::winegallon},
{"GAL_WI", precise::us::dry::winchester_gallon},
Expand Down

0 comments on commit ed6e646

Please sign in to comment.