diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h index 970496483a7..d2e9e4c29dd 100644 --- a/src/libs/utils/smallstring.h +++ b/src/libs/utils/smallstring.h @@ -95,7 +95,7 @@ public: std::memcpy(m_data.shortString.string, string, size); m_data.shortString.string[size] = 0; m_data.shortString.shortStringSize = uchar(size); - m_data.shortString.hasAllocated = false; + m_data.shortString.isReference = false; m_data.shortString.isReadOnlyReference = false; } else { m_data.allocated.data.pointer = Memory::allocate(capacity + 1); @@ -104,7 +104,7 @@ public: m_data.allocated.data.size = size; m_data.allocated.data.capacity = capacity; m_data.allocated.shortStringSize = 0; - m_data.allocated.hasAllocated = true; + m_data.allocated.isReference = true; m_data.allocated.isReadOnlyReference = false; } } @@ -470,7 +470,7 @@ public: UNIT_TEST_PUBLIC: bool isShortString() const noexcept { - return !m_data.shortString.hasAllocated; + return !m_data.shortString.isReference; } bool isReadOnlyReference() const noexcept diff --git a/src/libs/utils/smallstringlayout.h b/src/libs/utils/smallstringlayout.h index 0229e32b069..726f035eedf 100644 --- a/src/libs/utils/smallstringlayout.h +++ b/src/libs/utils/smallstringlayout.h @@ -63,7 +63,7 @@ struct AllocatedLayout { char dummy[maximumShortStringDataAreaSize - sizeof(Data)]; std::uint8_t shortStringSize: 6; std::uint8_t isReadOnlyReference : 1; - std::uint8_t hasAllocated : 1; + std::uint8_t isReference : 1; }; struct ReferenceLayout { @@ -75,14 +75,14 @@ struct ReferenceLayout { char dummy[maximumShortStringDataAreaSize - sizeof(Data)]; std::uint8_t shortStringSize: 6; std::uint8_t isReadOnlyReference : 1; - std::uint8_t hasAllocated : 1; + std::uint8_t isReference : 1; }; struct ShortStringLayout { char string[maximumShortStringDataAreaSize]; std::uint8_t shortStringSize: 6; std::uint8_t isReadOnlyReference : 1; - std::uint8_t hasAllocated : 1; + std::uint8_t isReference : 1; }; struct ALIGNAS_16 StringDataLayout { @@ -111,14 +111,14 @@ struct ALIGNAS_16 StringDataLayout { shortString.shortStringSize = std::uint8_t(Size) - 1; #pragma GCC diagnostic pop #endif - shortString.hasAllocated = false; + shortString.isReference = false; shortString.isReadOnlyReference = false; } else { reference.data.pointer = string; reference.data.size = Size - 1; reference.data.capacity = 0; reference.shortStringSize = 0; - reference.hasAllocated = true; + reference.isReference = true; reference.isReadOnlyReference = true; } #endif diff --git a/src/libs/utils/smallstringliteral.h b/src/libs/utils/smallstringliteral.h index 6ad79fe6162..5b5a03a265a 100644 --- a/src/libs/utils/smallstringliteral.h +++ b/src/libs/utils/smallstringliteral.h @@ -107,7 +107,7 @@ public: constexpr bool isShortString() const noexcept { - return !m_data.shortString.hasAllocated; + return !m_data.shortString.isReference; } constexpr