diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/ox/std/string.hpp index 8a1cb7d0..d31f58be 100644 --- a/deps/ox/src/ox/std/string.hpp +++ b/deps/ox/src/ox/std/string.hpp @@ -139,7 +139,7 @@ class BasicString { constexpr BasicString &operator+=(Integer_c auto i) noexcept; - constexpr BasicString &operator+=(StringView src) noexcept; + constexpr BasicString &operator+=(StringViewCR src) noexcept; constexpr BasicString &operator+=(BasicString const&src) noexcept; @@ -185,7 +185,7 @@ class BasicString { return {}; } - constexpr Error append(ox::StringView sv) noexcept { + constexpr Error append(StringViewCR sv) noexcept { return append(sv.data(), sv.size()); } @@ -376,7 +376,7 @@ constexpr BasicString &BasicString::operat } template -constexpr BasicString &BasicString::operator+=(StringView s) noexcept { +constexpr BasicString &BasicString::operator+=(StringViewCR s) noexcept { std::size_t strLen = s.bytes(); std::ignore = append(s.data(), strLen); return *this; @@ -456,7 +456,7 @@ constexpr bool BasicString::operator==(const char *other) con template constexpr bool BasicString::operator==(OxString_c auto const&other) const noexcept { - return ox::StringView(*this) == ox::StringView(other); + return StringView(*this) == StringView(other); } template @@ -548,28 +548,28 @@ using StringCR = String const&; [[nodiscard]] -constexpr ox::String toString(ox::StringViewCR sv) noexcept { +constexpr String toString(StringViewCR sv) noexcept { return ox::String(sv); } template [[nodiscard]] -constexpr auto sizeOf(const ox::BasicString*) noexcept { +constexpr auto sizeOf(BasicString const*) noexcept { VectorMemMap v{.smallVecSize = SmallStringSize_v}; return sizeOf(&v); } template [[nodiscard]] -constexpr auto alignOf(const ox::BasicString&) noexcept { +constexpr auto alignOf(BasicString const&) noexcept { VectorMemMap v{.smallVecSize = SmallStringSize_v}; return alignOf(&v); } template -struct MaybeView> { - using type = ox::StringView; +struct MaybeView> { + using type = StringView; }; }