Merge 382a7b99d4 into 649fe0fc8b
This commit is contained in:
commit
77ea5e91f4
@ -2088,7 +2088,7 @@ struct formatter<std::chrono::time_point<std::chrono::system_clock, Duration>,
|
|||||||
if (subsecs.count() < 0) {
|
if (subsecs.count() < 0) {
|
||||||
auto second =
|
auto second =
|
||||||
std::chrono::duration_cast<Duration>(std::chrono::seconds(1));
|
std::chrono::duration_cast<Duration>(std::chrono::seconds(1));
|
||||||
if (epoch.count() < ((Duration::min)() + second).count())
|
if ((epoch + second).count() < ((Duration::min)() + second).count())
|
||||||
FMT_THROW(format_error("duration is too small"));
|
FMT_THROW(format_error("duration is too small"));
|
||||||
subsecs += second;
|
subsecs += second;
|
||||||
val -= second;
|
val -= second;
|
||||||
|
|||||||
@ -1002,4 +1002,4 @@ TEST(chrono_test, glibc_extensions) {
|
|||||||
EXPECT_EQ(fmt::format("{:%_S}", d), " 3.140000");
|
EXPECT_EQ(fmt::format("{:%_S}", d), " 3.140000");
|
||||||
EXPECT_EQ(fmt::format("{:%-S}", d), "3.140000");
|
EXPECT_EQ(fmt::format("{:%-S}", d), "3.140000");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user