diff --git a/src/misc/pq/literals.cpp b/src/misc/pq/literals.cpp index 5f6e27d18..60784b285 100644 --- a/src/misc/pq/literals.cpp +++ b/src/misc/pq/literals.cpp @@ -201,36 +201,4 @@ namespace swift::misc::physical_quantities::Literals { return { static_cast(value), CTemperatureUnit::K() }; } - - CTime operator""_d(long double value) { return { static_cast(value), CTimeUnit::d() }; } - - CTime operator""_d(unsigned long long value) { return { static_cast(value), CTimeUnit::d() }; } - - CTime operator""_h(long double value) { return { static_cast(value), CTimeUnit::h() }; } - - CTime operator""_h(unsigned long long value) { return { static_cast(value), CTimeUnit::h() }; } - - CTime operator""_s(long double value) { return { static_cast(value), CTimeUnit::s() }; } - - CTime operator""_s(unsigned long long value) { return { static_cast(value), CTimeUnit::s() }; } - - CTime operator""_ms(long double value) { return { static_cast(value), CTimeUnit::ms() }; } - - CTime operator""_ms(unsigned long long value) { return { static_cast(value), CTimeUnit::ms() }; } - - CTime operator""_min(long double value) { return { static_cast(value), CTimeUnit::min() }; } - - CTime operator""_min(unsigned long long value) { return { static_cast(value), CTimeUnit::min() }; } - - CTime operator""_hms(long double value) { return { static_cast(value), CTimeUnit::hms() }; } - - CTime operator""_hms(unsigned long long value) { return { static_cast(value), CTimeUnit::hms() }; } - - CTime operator""_hrmin(long double value) { return { static_cast(value), CTimeUnit::hrmin() }; } - - CTime operator""_hrmin(unsigned long long value) { return { static_cast(value), CTimeUnit::hrmin() }; } - - CTime operator""_minsec(long double value) { return { static_cast(value), CTimeUnit::minsec() }; } - - CTime operator""_minsec(unsigned long long value) { return { static_cast(value), CTimeUnit::minsec() }; } } // namespace swift::misc::physical_quantities::Literals diff --git a/src/misc/pq/literals.h b/src/misc/pq/literals.h index 0f42c5dda..9dac614fc 100644 --- a/src/misc/pq/literals.h +++ b/src/misc/pq/literals.h @@ -236,54 +236,6 @@ namespace swift::misc::physical_quantities SWIFT_MISC_EXPORT CTemperature operator""_degK(long double); SWIFT_MISC_EXPORT CTemperature operator""_degK(unsigned long long); //! @} - - //! @{ - //! User-defined literal for days - SWIFT_MISC_EXPORT CTime operator""_d(long double); - SWIFT_MISC_EXPORT CTime operator""_d(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for hours - SWIFT_MISC_EXPORT CTime operator""_h(long double); - SWIFT_MISC_EXPORT CTime operator""_h(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for seconds - SWIFT_MISC_EXPORT CTime operator""_s(long double); - SWIFT_MISC_EXPORT CTime operator""_s(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for miliseconds - SWIFT_MISC_EXPORT CTime operator""_ms(long double); - SWIFT_MISC_EXPORT CTime operator""_ms(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for minutes - SWIFT_MISC_EXPORT CTime operator""_min(long double); - SWIFT_MISC_EXPORT CTime operator""_min(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for hours/minutes/seconds - SWIFT_MISC_EXPORT CTime operator""_hms(long double); - SWIFT_MISC_EXPORT CTime operator""_hms(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for hours/minutes - SWIFT_MISC_EXPORT CTime operator""_hrmin(long double); - SWIFT_MISC_EXPORT CTime operator""_hrmin(unsigned long long); - //! @} - - //! @{ - //! User-defined literal for minutes/seconds - SWIFT_MISC_EXPORT CTime operator""_minsec(long double); - SWIFT_MISC_EXPORT CTime operator""_minsec(unsigned long long); - //! @} } // namespace Literals } // namespace swift::misc::physical_quantities diff --git a/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp b/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp index 510599928..d69a5913e 100644 --- a/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp +++ b/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp @@ -440,24 +440,6 @@ namespace MiscTest QVERIFY2(35_degC == CTemperature(35, CTemperatureUnit::C()), "Temperature needs to be the same"); QVERIFY2(-20_degF == CTemperature(-20, CTemperatureUnit::F()), "Temperature needs to be the same"); QVERIFY2(140_degK == CTemperature(140, CTemperatureUnit::K()), "Temperature needs to be the same"); - - // Time - QVERIFY2(24.5_d == CTime(24.5, CTimeUnit::d()), "Time needs to be the same"); - QVERIFY2(23.99_h == CTime(23.99, CTimeUnit::h()), "Time needs to be the same"); - QVERIFY2(30.1_s == CTime(30.1, CTimeUnit::s()), "Time needs to be the same"); - QVERIFY2(20.0_ms == CTime(20.0, CTimeUnit::ms()), "Time needs to be the same"); - QVERIFY2(65.7_min == CTime(65.7, CTimeUnit::min()), "Time needs to be the same"); - QVERIFY2(53215.0_hms == CTime(53215, CTimeUnit::hms()), "Time needs to be the same"); - QVERIFY2(236.0_hrmin == CTime(236, CTimeUnit::hrmin()), "Time needs to be the same"); - QVERIFY2(3030.0_minsec == CTime(3030, CTimeUnit::minsec()), "Time needs to be the same"); - QVERIFY2(31_d == CTime(31, CTimeUnit::d()), "Time needs to be the same"); - QVERIFY2(24_h == CTime(24, CTimeUnit::h()), "Time needs to be the same"); - QVERIFY2(60_s == CTime(60, CTimeUnit::s()), "Time needs to be the same"); - QVERIFY2(40_ms == CTime(40, CTimeUnit::ms()), "Time needs to be the same"); - QVERIFY2(36_min == CTime(36, CTimeUnit::min()), "Time needs to be the same"); - QVERIFY2(102010_hms == CTime(102010, CTimeUnit::hms()), "Time needs to be the same"); - QVERIFY2(510_hrmin == CTime(510, CTimeUnit::hrmin()), "Time needs to be the same"); - QVERIFY2(2637_minsec == CTime(2637, CTimeUnit::minsec()), "Time needs to be the same"); } } // namespace MiscTest