Skip to content

Commit

Permalink
Merge branch 'r20_update' of https://github.com/LLNL/units into r20_u…
Browse files Browse the repository at this point in the history
…pdate
  • Loading branch information
phlptp committed Oct 20, 2023
2 parents 81d8245 + ed6e646 commit 0f9e38c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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 @@ -4784,7 +4784,6 @@ static bool cleanUnitStringPhase2(std::string& unit_string)
std::remove(unit_string.begin(), unit_string.end(), '+'),
unit_string.end());


clearEmptySegments(unit_string);
if (!unit_string.empty() && (unit_string.back() == 'F' || unit_string.back() == 'C'))
{
Expand Down

0 comments on commit 0f9e38c

Please sign in to comment.