From: Steinar H. Gunderson Date: Fri, 2 Feb 2018 20:52:15 +0000 (+0100) Subject: Fix a compile error with GCC 5 on Ubuntu. X-Git-Tag: 1.6.2~3 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=9f81e6514af07d976a2f48e4f71cfa6b0253b600 Fix a compile error with GCC 5 on Ubuntu. --- diff --git a/fp16_test.cpp b/fp16_test.cpp index 7a9d566..4022126 100644 --- a/fp16_test.cpp +++ b/fp16_test.cpp @@ -1,6 +1,6 @@ #include "fp16.h" -#include +#include #include namespace movit { @@ -56,27 +56,27 @@ union fp32 { TEST(FP16Test, NaN) { // Ignore the sign bit. EXPECT_EQ(0x7e00, fp32_to_fp16(0.0 / 0.0).val & 0x7fff); - EXPECT_TRUE(isnan(fp16_to_fp32(make_fp16(0xfe00)))); + EXPECT_TRUE(std::isnan(fp16_to_fp32(make_fp16(0xfe00)))); fp32 borderline_inf; borderline_inf.u = 0x7f800000ull; fp32 borderline_nan; borderline_nan.u = 0x7f800001ull; - ASSERT_FALSE(isfinite(borderline_inf.f)); - ASSERT_FALSE(isnan(borderline_inf.f)); + ASSERT_FALSE(std::isfinite(borderline_inf.f)); + ASSERT_FALSE(std::isnan(borderline_inf.f)); - ASSERT_FALSE(isfinite(borderline_nan.f)); - ASSERT_TRUE(isnan(borderline_nan.f)); + ASSERT_FALSE(std::isfinite(borderline_nan.f)); + ASSERT_TRUE(std::isnan(borderline_nan.f)); double borderline_inf_roundtrip = fp16_to_fp32(fp32_to_fp16(borderline_inf.f)); double borderline_nan_roundtrip = fp16_to_fp32(fp32_to_fp16(borderline_nan.f)); - EXPECT_FALSE(isfinite(borderline_inf_roundtrip)); - EXPECT_FALSE(isnan(borderline_inf_roundtrip)); + EXPECT_FALSE(std::isfinite(borderline_inf_roundtrip)); + EXPECT_FALSE(std::isnan(borderline_inf_roundtrip)); - EXPECT_FALSE(isfinite(borderline_nan_roundtrip)); - EXPECT_TRUE(isnan(borderline_nan_roundtrip)); + EXPECT_FALSE(std::isfinite(borderline_nan_roundtrip)); + EXPECT_TRUE(std::isnan(borderline_nan_roundtrip)); } TEST(FP16Test, Denormals) {