diff --git a/iface/common/numeric.hh b/iface/common/numeric.hh index 852af36..485640d 100644 --- a/iface/common/numeric.hh +++ b/iface/common/numeric.hh @@ -7,7 +7,7 @@ namespace nf7 { template -auto castSafely( +auto CastSafely( T v, std::source_location location = std::source_location::current()) -> std::enable_if_t && std::is_arithmetic_v, R> { const auto r = static_cast(v); diff --git a/iface/common/numeric_test.cc b/iface/common/numeric_test.cc index 4a361b4..f1286c9 100644 --- a/iface/common/numeric_test.cc +++ b/iface/common/numeric_test.cc @@ -7,17 +7,17 @@ TEST(Numeric, CastSafelyShrink) { - EXPECT_EQ(nf7::castSafely(uint32_t {0}), 0); + EXPECT_EQ(nf7::CastSafely(uint32_t {0}), 0); } TEST(Numeric, CastSafelyShrinkWithOverflow) { - EXPECT_THROW(nf7::castSafely(uint32_t {1000}), nf7::Exception); + EXPECT_THROW(nf7::CastSafely(uint32_t {1000}), nf7::Exception); } TEST(Numeric, CastSafelyShrinkWithUnderflow) { - EXPECT_THROW(nf7::castSafely(int32_t {-1000}), nf7::Exception); + EXPECT_THROW(nf7::CastSafely(int32_t {-1000}), nf7::Exception); } TEST(Numeric, CastSafelyShrinkWithSignDrop) { - EXPECT_THROW(nf7::castSafely(int32_t {-1}), nf7::Exception); + EXPECT_THROW(nf7::CastSafely(int32_t {-1}), nf7::Exception); } TEST(Numeric, CastSafelyExpand) { - EXPECT_EQ(nf7::castSafely(uint8_t {255}), 255); + EXPECT_EQ(nf7::CastSafely(uint8_t {255}), 255); } diff --git a/iface/common/value.hh b/iface/common/value.hh index 43bb44e..a63fd2f 100644 --- a/iface/common/value.hh +++ b/iface/common/value.hh @@ -266,10 +266,10 @@ class Value final { N num(std::optional def = std::nullopt, std::source_location location = std::source_location::current()) const { if (is()) { - return castSafely(as()); + return CastSafely(as()); } if (is()) { - return castSafely(as()); + return CastSafely(as()); } if (std::nullopt != def) { return *def;