diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h index 1c6516a3c3a..6efe575e377 100644 --- a/src/libs/utils/smallstring.h +++ b/src/libs/utils/smallstring.h @@ -508,7 +508,6 @@ UNIT_TEST_PUBLIC: } private: - constexpr SmallString(Internal::StringDataLayout data) noexcept : m_data(data) { diff --git a/src/libs/utils/smallstringliteral.h b/src/libs/utils/smallstringliteral.h index 47c7dab33b4..a4b505a56b5 100644 --- a/src/libs/utils/smallstringliteral.h +++ b/src/libs/utils/smallstringliteral.h @@ -66,13 +66,11 @@ public: { } - constexpr const char *data() const { return Q_LIKELY(isShortString()) ? m_data.shortString.string : m_data.allocated.data.pointer; } - constexpr size_type size() const { return Q_LIKELY(isShortString()) ? m_data.shortString.shortStringSize : m_data.allocated.data.size; @@ -104,13 +102,11 @@ public: return sizeof(Internal::ShortStringLayout) - 2; } - constexpr bool isShortString() const noexcept { return !m_data.shortString.isReference; } - constexpr bool isReadOnlyReference() const noexcept { return m_data.shortString.isReadOnlyReference; @@ -122,7 +118,7 @@ public: } private: - constexpr SmallStringLiteral(Internal::StringDataLayout data) noexcept + SmallStringLiteral(Internal::StringDataLayout data) noexcept : m_data(data) { } diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index fe688043a35..f699b78ba3e 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -66,7 +66,7 @@ SOURCES += \ chunksreportedmonitor.cpp \ unsavedfiletest.cpp \ clangisdiagnosticrelatedtolocationtest.cpp \ -# smallstringtest.cpp \ + smallstringtest.cpp \ highlightingmarkstest.cpp \ sizedarraytest.cpp \ utf8positionfromlinecolumntest.cpp \