External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove check of huge double in test after new behavior, loss of precision is inevitable in this case?

Browse Source 
* Remove constexpr-if statements since the macro FMT_CONSTEXPR depends on c++14 and not on c++17
This commit is contained in:
Filip Matracki 2021-10-20 13:28:14 +02:00
parent c4b9c27936
commit 1067285501
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/chrono.h
View File

@ -955,8 +955,8 @@ template <class Duration> struct subsecond_helper {
template <class Rep, class Period> template <class Rep, class Period>
static FMT_CONSTEXPR std::chrono::duration<Rep, Period> abs( static FMT_CONSTEXPR std::chrono::duration<Rep, Period> abs(
std::chrono::duration<Rep, Period> d) { std::chrono::duration<Rep, Period> d) {
if FMT_CONSTEXPR (std::chrono::duration<Rep, Period>::min() < if (std::chrono::duration<Rep, Period>::min() <
std::chrono::duration<Rep, Period>::zero()) { std::chrono::duration<Rep, Period>::zero()) {
return d >= d.zero() ? d : -d; return d >= d.zero() ? d : -d;
} else { } else {
return d; return d;
@ -971,8 +971,7 @@ template <class Duration> struct subsecond_helper {
template <class Rep, class Period> template <class Rep, class Period>
static FMT_CONSTEXPR precision static FMT_CONSTEXPR precision
get_subseconds(std::chrono::duration<Rep, Period> d) { get_subseconds(std::chrono::duration<Rep, Period> d) {
if FMT_CONSTEXPR (std::chrono::treat_as_floating_point< if (std::chrono::treat_as_floating_point<typename precision::rep>::value) {
typename precision::rep>::value) {
return abs(d) - std::chrono::duration_cast<std::chrono::seconds>(d); return abs(d) - std::chrono::duration_cast<std::chrono::seconds>(d);
} else { } else {
return std::chrono::duration_cast<precision>( return std::chrono::duration_cast<precision>(

3
test/chrono-test.cc
View File

@ -499,9 +499,6 @@ TEST(chrono_test, negative_durations) {
} }
TEST(chrono_test, special_durations) { TEST(chrono_test, special_durations) {
EXPECT_EQ(
"40",
fmt::format("{:%S}", std::chrono::duration<double>(1e20)).substr(0, 3));
auto nan = std::numeric_limits<double>::quiet_NaN(); auto nan = std::numeric_limits<double>::quiet_NaN();
EXPECT_EQ( EXPECT_EQ(
"nan nan nan nan nan:nan nan", "nan nan nan nan nan:nan nan",