diff --git a/units/unit_definitions.hpp b/units/unit_definitions.hpp index f66a1417..f8248eb0 100644 --- a/units/unit_definitions.hpp +++ b/units/unit_definitions.hpp @@ -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 { @@ -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}; diff --git a/units/units.cpp b/units/units.cpp index 314732d9..471c84b2 100644 --- a/units/units.cpp +++ b/units/units.cpp @@ -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()); } diff --git a/units/units_conversion_maps.hpp b/units/units_conversion_maps.hpp index ee9fcda2..aa039a80 100644 --- a/units/units_conversion_maps.hpp +++ b/units/units_conversion_maps.hpp @@ -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},