diff options
| author | Mike Toews <mwtoews@gmail.com> | 2018-09-11 23:17:51 +1200 |
|---|---|---|
| committer | Mike Toews <mwtoews@gmail.com> | 2018-09-11 23:19:33 +1200 |
| commit | 3da5c306cec8bd3a5e2dd9dee83587a5d0a94dd7 (patch) | |
| tree | afc5c9997de6e06b887dd45c87bea8aebad02a9f | |
| parent | 70866367bf356ab72d1222edbc0bc087d682b325 (diff) | |
| download | PROJ-3da5c306cec8bd3a5e2dd9dee83587a5d0a94dd7.tar.gz PROJ-3da5c306cec8bd3a5e2dd9dee83587a5d0a94dd7.zip | |
workaround Intel's shortcoming with constexpr
| -rw-r--r-- | test/unit/pj_phi2_test.cpp | 6 | ||||
| -rw-r--r-- | test/unit/proj_errno_string_test.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/unit/pj_phi2_test.cpp b/test/unit/pj_phi2_test.cpp index 20e86e8d..186bcbc5 100644 --- a/test/unit/pj_phi2_test.cpp +++ b/test/unit/pj_phi2_test.cpp @@ -64,13 +64,13 @@ TEST(PjPhi2Test, Basic) { TEST(PjPhi2Test, AvoidUndefinedBehavior) { auto ctx = pj_get_default_ctx(); - constexpr auto nan = std::numeric_limits<double>::quiet_NaN(); + const auto nan = std::numeric_limits<double>::quiet_NaN(); EXPECT_TRUE(std::isnan(pj_phi2(ctx, nan, 0.0))); EXPECT_TRUE(std::isnan(pj_phi2(ctx, 0.0, nan))); EXPECT_TRUE(std::isnan(pj_phi2(ctx, nan, nan))); // We do not really care about the values that follow. - constexpr auto inf = std::numeric_limits<double>::infinity(); + const auto inf = std::numeric_limits<double>::infinity(); EXPECT_DOUBLE_EQ(-M_PI_2, pj_phi2(ctx, inf, 0.0)); EXPECT_TRUE(std::isnan(pj_phi2(ctx, 0.0, inf))); @@ -82,4 +82,4 @@ TEST(PjPhi2Test, AvoidUndefinedBehavior) { EXPECT_TRUE(std::isnan(pj_phi2(ctx, -inf, -inf))); } -} // namespace
\ No newline at end of file +} // namespace diff --git a/test/unit/proj_errno_string_test.cpp b/test/unit/proj_errno_string_test.cpp index 0e4cff7f..92840d34 100644 --- a/test/unit/proj_errno_string_test.cpp +++ b/test/unit/proj_errno_string_test.cpp @@ -43,13 +43,13 @@ TEST(ProjErrnoStringTest, ProjErrnos) { EXPECT_STREQ("invalid projection system error (-1000)", proj_errno_string(-1000)); EXPECT_STREQ("invalid projection system error (-9999)", proj_errno_string(-9999)); // for errnos < -9999, -9999 is always returned - constexpr int min = std::numeric_limits<int>::min(); + const int min = std::numeric_limits<int>::min(); EXPECT_STREQ("invalid projection system error (-9999)",proj_errno_string(min)); EXPECT_STREQ("invalid projection system error (-9999)", proj_errno_string(-10000)); } TEST(ProjErrnoStringTest, SystemErrnos) { - constexpr int max = std::numeric_limits<int>::max(); + const int max = std::numeric_limits<int>::max(); #ifdef HAVE_STRERROR EXPECT_STREQ(strerror(5), proj_errno_string(5)); |