mirror of
https://github.com/nholthaus/units.git
synced 2026-01-14 00:19:27 +01:00
Merge pull request #352 from 0xf00ff00f/master
Typo: rename astronicalUnit to astronomical_unit
This commit is contained in:
@@ -3401,9 +3401,9 @@ namespace units
|
||||
UNIT_ADD(length, mil, mils, mil, unit<std::ratio<1, 1000>, inches>)
|
||||
UNIT_ADD(length, mile, miles, mi, unit<std::ratio<5280>, feet>)
|
||||
UNIT_ADD(length, nauticalMile, nauticalMiles, nmi, unit<std::ratio<1852>, meters>)
|
||||
UNIT_ADD(length, astronicalUnit, astronicalUnits, au, unit<std::ratio<149597870700>, meters>)
|
||||
UNIT_ADD(length, astronomical_unit, astronomical_units, au, unit<std::ratio<149597870700>, meters>)
|
||||
UNIT_ADD(length, lightyear, lightyears, ly, unit<std::ratio<9460730472580800>, meters>)
|
||||
UNIT_ADD(length, parsec, parsecs, pc, unit<std::ratio<648000>, astronicalUnits, std::ratio<-1>>)
|
||||
UNIT_ADD(length, parsec, parsecs, pc, unit<std::ratio<648000>, astronomical_units, std::ratio<-1>>)
|
||||
UNIT_ADD(length, angstrom, angstroms, angstrom, unit<std::ratio<1, 10>, nanometers>)
|
||||
UNIT_ADD(length, cubit, cubits, cbt, unit<std::ratio<18>, inches>)
|
||||
UNIT_ADD(length, fathom, fathoms, ftm, unit<std::ratio<6>, feet>)
|
||||
|
||||
@@ -218,11 +218,11 @@ TEST_F(TypeTraits, all_true)
|
||||
TEST_F(TypeTraits, is_convertible_unit)
|
||||
{
|
||||
EXPECT_TRUE((traits::is_convertible_unit<meters, meters>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<meters, astronicalUnits>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<meters, astronomical_units>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<meters, parsecs>::value));
|
||||
|
||||
EXPECT_TRUE((traits::is_convertible_unit<meters, meters>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<astronicalUnits, meters>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<astronomical_units, meters>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<parsecs, meters>::value));
|
||||
EXPECT_TRUE((traits::is_convertible_unit<years, weeks>::value));
|
||||
|
||||
@@ -747,16 +747,16 @@ TEST_F(TypeTraits, is_area_unit)
|
||||
|
||||
EXPECT_TRUE((traits::is_area_unit<square_meter>::value));
|
||||
EXPECT_TRUE((traits::is_area_unit<hectare>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<astronicalUnit>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<astronomical_unit>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<double>::value));
|
||||
|
||||
EXPECT_TRUE((traits::is_area_unit<square_meter_t>::value));
|
||||
EXPECT_TRUE((traits::is_area_unit<const square_meter_t>::value));
|
||||
EXPECT_TRUE((traits::is_area_unit<const square_meter_t&>::value));
|
||||
EXPECT_TRUE((traits::is_area_unit<hectare_t>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<astronicalUnit_t>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<astronomical_unit_t>::value));
|
||||
EXPECT_TRUE((traits::is_area_unit<hectare_t, square_meter_t>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<astronicalUnit_t, square_meter_t>::value));
|
||||
EXPECT_FALSE((traits::is_area_unit<astronomical_unit_t, square_meter_t>::value));
|
||||
}
|
||||
|
||||
TEST_F(TypeTraits, is_volume_unit)
|
||||
@@ -1638,7 +1638,7 @@ TEST_F(UnitConversion, length)
|
||||
EXPECT_NEAR(1.0, test, 5.0e-20);
|
||||
test = convert<meters, nauticalMiles>(1852.0);
|
||||
EXPECT_NEAR(1.0, test, 5.0e-20);
|
||||
test = convert<meters, astronicalUnits>(149597870700.0);
|
||||
test = convert<meters, astronomical_units>(149597870700.0);
|
||||
EXPECT_NEAR(1.0, test, 5.0e-20);
|
||||
test = convert<meters, lightyears>(9460730472580800.0);
|
||||
EXPECT_NEAR(1.0, test, 5.0e-20);
|
||||
|
||||
Reference in New Issue
Block a user