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

Utils: Fix spacing

Browse Source 
Change-Id: I3c3f4e22ad64144f7ea92e671b9f582fd434b491
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-08-02 19:08:14 +02:00
committed by Tim Jenssen
parent 4c7cc99375
commit d54db53d2f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,7 +258,7 @@ public:
if (fitsNotInCapacity(newCapacity)) { if (fitsNotInCapacity(newCapacity)) {
if (Q_UNLIKELY(hasAllocatedMemory())) { if (Q_UNLIKELY(hasAllocatedMemory())) {
m_data.allocated.data.pointer = Memory::reallocate(m_data.allocated.data.pointer, m_data.allocated.data.pointer = Memory::reallocate(m_data.allocated.data.pointer,
newCapacity + 1); newCapacity + 1);
m_data.allocated.data.capacity = newCapacity; m_data.allocated.data.capacity = newCapacity;
} else if (newCapacity <= shortStringCapacity()) { } else if (newCapacity <= shortStringCapacity()) {
new (this) BasicSmallString{m_data.allocated.data.pointer, m_data.allocated.data.size}; new (this) BasicSmallString{m_data.allocated.data.pointer, m_data.allocated.data.size};

2
src/libs/utils/smallstringlayout.h
View File

@@ -92,7 +92,7 @@ struct ShortStringLayout {
template <uint MaximumShortStringDataAreaSize> template <uint MaximumShortStringDataAreaSize>
struct ALIGNAS_16 StringDataLayout { struct ALIGNAS_16 StringDataLayout {
static_assert( MaximumShortStringDataAreaSize >= 15, "Size must be greater equal than 15 bytes!"); static_assert(MaximumShortStringDataAreaSize >= 15, "Size must be greater equal than 15 bytes!");
static_assert(MaximumShortStringDataAreaSize < 64 static_assert(MaximumShortStringDataAreaSize < 64
? ((MaximumShortStringDataAreaSize + 1) % 16) == 0 ? ((MaximumShortStringDataAreaSize + 1) % 16) == 0
: ((MaximumShortStringDataAreaSize + 2) % 16) == 0, : ((MaximumShortStringDataAreaSize + 2) % 16) == 0,