From b7fe301313d4f2e64d058d91f779e72b44d38f03 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 28 Sep 2024 17:46:45 -0500 Subject: [PATCH] [ox] Rename CRString to StringCR (synced from 1a9f0d49e765dae86ac485374881667e72260e12) --- src/ox/model/modelvalue.hpp | 2 +- src/ox/std/string.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ox/model/modelvalue.hpp b/src/ox/model/modelvalue.hpp index 90088cf30..7a62060a3 100644 --- a/src/ox/model/modelvalue.hpp +++ b/src/ox/model/modelvalue.hpp @@ -652,7 +652,7 @@ class ModelObject { } [[nodiscard]] - constexpr CRString typeName() const noexcept { + constexpr StringCR typeName() const noexcept { return m_type->typeName; } diff --git a/src/ox/std/string.hpp b/src/ox/std/string.hpp index 7c43bb9f4..7d6a7bac0 100644 --- a/src/ox/std/string.hpp +++ b/src/ox/std/string.hpp @@ -539,7 +539,7 @@ constexpr void BasicString::set(const char8_t *str) noexcept extern template class BasicString<8>; using String = BasicString<8>; -using CRString = String const&; +using StringCR = String const&; [[nodiscard]]