From 0d9ea1d3a3e37bf86011f3007d3c64faad8058c9 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 8 Aug 2020 12:09:23 +0200 Subject: [PATCH] Changes empty static StringView, as it caused conflicts with older Empty bool checker. --- src/String/StringView.hpp | 2 +- tests/StringViewTests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/String/StringView.hpp b/src/String/StringView.hpp index 88f16cb..22c55c6 100644 --- a/src/String/StringView.hpp +++ b/src/String/StringView.hpp @@ -87,7 +87,7 @@ namespace ArbUt { return Hash(val.data()); } - static const StringView& Empty(); + static const StringView& EmptyString(); }; } diff --git a/tests/StringViewTests.cpp b/tests/StringViewTests.cpp index d341930..7ce047f 100644 --- a/tests/StringViewTests.cpp +++ b/tests/StringViewTests.cpp @@ -77,7 +77,7 @@ TEST_CASE("Out of scope char* doesn't lose reference", "[Utilities]") { } TEST_CASE("Get Empty String", "[Utilities]") { - REQUIRE(ArbUt::StringView::Empty() == ""_cnc); + REQUIRE(ArbUt::StringView::EmptyString() == ""_cnc); }