From a3b8303f3c37a07857bfe29c2bc1ab7ca2bd4a7a Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Sun, 7 Nov 2021 21:33:56 +0000 Subject: [PATCH] LibJS: Fix modulo() template argument deduction on i686 Userland/Libraries/LibJS/Runtime/Temporal/PlainTime.cpp:283:24: note: deduced conflicting types for parameter 'T' ('long long int' and 'long int') 283 | nanosecond = modulo(nanosecond, 1000l); | ~~~~~~^~~~~~~~~~~~~~~~~~~ Worked fine on x86_84 :yakshrug: --- .../Libraries/LibJS/Runtime/Temporal/PlainTime.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainTime.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainTime.cpp index a0250389c8e..83821849bd1 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainTime.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainTime.cpp @@ -280,37 +280,37 @@ DaysAndTime balance_time(i64 hour, i64 minute, i64 second, i64 millisecond, i64 microsecond += nanosecond / 1000; // 3. Set nanosecond to nanosecond modulo 1000. - nanosecond = modulo(nanosecond, 1000l); + nanosecond = modulo(nanosecond, (i64)1000); // 4. Set millisecond to millisecond + floor(microsecond / 1000). millisecond += microsecond / 1000; // 5. Set microsecond to microsecond modulo 1000. - microsecond = modulo(microsecond, 1000l); + microsecond = modulo(microsecond, (i64)1000); // 6. Set second to second + floor(millisecond / 1000). second += millisecond / 1000; // 7. Set millisecond to millisecond modulo 1000. - millisecond = modulo(millisecond, 1000l); + millisecond = modulo(millisecond, (i64)1000); // 8. Set minute to minute + floor(second / 60). minute += second / 60; // 9. Set second to second modulo 60. - second = modulo(second, 60l); + second = modulo(second, (i64)60); // 10. Set hour to hour + floor(minute / 60). hour += minute / 60; // 11. Set minute to minute modulo 60. - minute = modulo(minute, 60l); + minute = modulo(minute, (i64)60); // 12. Let days be floor(hour / 24). u8 days = hour / 24; // 13. Set hour to hour modulo 24. - hour = modulo(hour, 24l); + hour = modulo(hour, (i64)24); // 14. Return the Record { [[Days]]: days, [[Hour]]: hour, [[Minute]]: minute, [[Second]]: second, [[Millisecond]]: millisecond, [[Microsecond]]: microsecond, [[Nanosecond]]: nanosecond }. return DaysAndTime {