feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix smallstring

Browse Source 
Change-Id: I681df8c3fd9aa84f14d5d581633894605f56b71a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2016-08-01 17:14:33 +02:00
parent 395d0045bd
commit 7610e48716
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/smallstring.h
View File

@@ -508,7 +508,6 @@ UNIT_TEST_PUBLIC:
} }
private: private:
constexpr
SmallString(Internal::StringDataLayout data) noexcept SmallString(Internal::StringDataLayout data) noexcept
: m_data(data) : m_data(data)
{ {

6
src/libs/utils/smallstringliteral.h
View File

@@ -66,13 +66,11 @@ public:
{ {
} }
constexpr
const char *data() const const char *data() const
{ {
return Q_LIKELY(isShortString()) ? m_data.shortString.string : m_data.allocated.data.pointer; return Q_LIKELY(isShortString()) ? m_data.shortString.string : m_data.allocated.data.pointer;
} }
constexpr
size_type size() const size_type size() const
{ {
return Q_LIKELY(isShortString()) ? m_data.shortString.shortStringSize : m_data.allocated.data.size; return Q_LIKELY(isShortString()) ? m_data.shortString.shortStringSize : m_data.allocated.data.size;
@@ -104,13 +102,11 @@ public:
return sizeof(Internal::ShortStringLayout) - 2; return sizeof(Internal::ShortStringLayout) - 2;
} }
constexpr
bool isShortString() const noexcept bool isShortString() const noexcept
{ {
return !m_data.shortString.isReference; return !m_data.shortString.isReference;
} }
constexpr
bool isReadOnlyReference() const noexcept bool isReadOnlyReference() const noexcept
{ {
return m_data.shortString.isReadOnlyReference; return m_data.shortString.isReadOnlyReference;
@@ -122,7 +118,7 @@ public:
} }
private: private:
constexpr SmallStringLiteral(Internal::StringDataLayout data) noexcept SmallStringLiteral(Internal::StringDataLayout data) noexcept
: m_data(data) : m_data(data)
{ {
} }

2
tests/unit/unittest/unittest.pro
View File

@@ -66,7 +66,7 @@ SOURCES += \
chunksreportedmonitor.cpp \ chunksreportedmonitor.cpp \
unsavedfiletest.cpp \ unsavedfiletest.cpp \
clangisdiagnosticrelatedtolocationtest.cpp \ clangisdiagnosticrelatedtolocationtest.cpp \
# smallstringtest.cpp \ smallstringtest.cpp \
highlightingmarkstest.cpp \ highlightingmarkstest.cpp \
sizedarraytest.cpp \ sizedarraytest.cpp \
utf8positionfromlinecolumntest.cpp \ utf8positionfromlinecolumntest.cpp \